]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso : VCS par variable
authorVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 23:54:07 +0000 (01:54 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 25 Jul 2013 23:54:07 +0000 (01:54 +0200)
Conflicts:
.bashrc

1  2 
.bashrc

diff --cc .bashrc
Simple merge