From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Tue, 25 Aug 2009 19:46:50 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Url: http://olivier.miskin.fr/git/?p=dotfiles.git;a=commitdiff_plain;h=49435be5aefbd2440f0a242191e818caf349ac22

Merge commit 'origin/master'
---

49435be5aefbd2440f0a242191e818caf349ac22