From: Your Name <olivier.tetard@amossys.fr>
Date: Mon, 28 Nov 2011 13:56:46 +0000 (+0100)
Subject: Merge branch 'master' into amossys
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=b1e481a9d10a1344b1bac0c620fef8fe5fc44a73;p=dotfiles2.git

Merge branch 'master' into amossys
---

b1e481a9d10a1344b1bac0c620fef8fe5fc44a73