Tue Jan 21 18:24:50 JST 2014
Merge branch 'master' of github:Paul-U/Home

Conflicts:
	.emacs.d/init.d/40-orgmode.el