Merge branch 'master' of https://github.com/restran/diary.git
Merge branch 'master' of https://github.com/restran/diary.git