From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Mon, 19 Dec 2011 13:08:27 +0000 (+0100)
Subject: Merge branch 'master' into amossys
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=f21d63234aba00d887353bda4f3a370dc31aa1cb;p=dotfiles2.git

Merge branch 'master' into amossys
---

f21d63234aba00d887353bda4f3a370dc31aa1cb