From: Olivier Tétard <otd@otd.amossys.fr>
Date: Wed, 26 Aug 2009 08:10:48 +0000 (+0200)
Subject: Merge branch 'master' into light-emacs
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=330d462077ceb2e532ab927ea1db50f47c0c6018;p=dotfiles.git

Merge branch 'master' into light-emacs

Conflicts:
	emacs/emacs.el
---

330d462077ceb2e532ab927ea1db50f47c0c6018