From: Olivier Tétard Date: Sat, 11 Feb 2012 11:45:58 +0000 (+0100) Subject: Merge branch 'master' into amossys X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=refs%2Fheads%2Famossys;p=dotfiles2.git Merge branch 'master' into amossys --- 499bbd931dc0cc9133c51e8c6fe0f45ab9c94562