2013-11-27 diary plus
Merge branch 'master' of github.com:codepongo/diary