From: Olivier Tétard Date: Tue, 20 Dec 2011 17:46:39 +0000 (+0100) Subject: Merge branch 'master' into amossys X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=3169f8c55ef72792ff50198e3d1095a7419b8792;p=dotfiles2.git Merge branch 'master' into amossys --- 3169f8c55ef72792ff50198e3d1095a7419b8792