Multiple-line quotes
SA
merge
Merge branch 'master' of ssh://github.com/VISdiary/diary
Done
start JSON geneartor
Merge branch 'master' of github.com:zpiman/diary into DP

Conflicts:
	css/days.css
	css/notes.css