Tom Willemsen 5b8d412cf7 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .emacs.d/init.el		2012-09-25 22:20:43 +02:00
..
eshell	Move Emacs config	2012-09-11 10:32:30 +02:00
site-lisp	.emacs.d/site-lisp/quick-edit-mode.el	2012-09-25 22:02:59 +02:00
themes	.emacs.d/themes/new-theme.el	2012-09-25 22:03:20 +02:00
gnus.el	Move Emacs config	2012-09-11 10:32:30 +02:00
init.el	Merge remote-tracking branch 'origin/master' into phoenix	2012-09-25 22:20:43 +02:00