]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:22:54 +0000 (23:22 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:22:54 +0000 (23:22 +0200)
1  2 
.bashrc

diff --cc .bashrc
Simple merge