From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Sat, 11 Feb 2012 11:45:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://miskin.fr/home/toutoune25/scm/git/dotfiles2
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;p=dotfiles2.git

Merge branch 'master' of ssh://miskin.fr/home/toutoune25/scm/git/dotfiles2
---

b4a16b96a6a812d151a37c9e4fdd9659e175fef9