From: Vincent Le Gallic Date: Sat, 5 Apr 2014 21:44:16 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=39fae3a3633300d0f0bddb42e5c60533a3a1f113;p=config-20-100.git Merge branch 'master' into perso Conflicts: .bashrc --- 39fae3a3633300d0f0bddb42e5c60533a3a1f113