]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Fri, 26 Jul 2013 22:51:08 +0000 (00:51 +0200)
committerVincent Le Gallic <legallic@crans.org>
Fri, 26 Jul 2013 22:51:08 +0000 (00:51 +0200)
1  2 
.bashrc

diff --cc .bashrc
Simple merge