yo, fixed
Merge branch 'DP' of ssh://github.com/VISdiary/diary into DP