]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Fri, 15 Nov 2013 12:35:50 +0000 (13:35 +0100)
committerVincent Le Gallic <legallic@crans.org>
Fri, 15 Nov 2013 12:35:50 +0000 (13:35 +0100)
1  2 
.bashrc

diff --cc .bashrc
Simple merge