Mon Jan 27 04:15:53 JST 2014
Merge branch 'master' of github:Paul-U/Home

Conflicts:
	.emacs.d/init.d/40-orgmode.el
Tue Jan 28 07:23:47 JST 2014