]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 21:31:10 +0000 (23:31 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 21:31:10 +0000 (23:31 +0200)
1  2 
.bashrc

diff --cc .bashrc
Simple merge