Dec 22, 2014 17:18 #off_work#
Merge branch 'master' of github.com:cauchycai/cauchy-log

Conflicts:
	org/diary
	org/practice.org