]> gitweb.pimeys.fr Git - config-20-100.git/commit
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)
commit9b2ac25dff2033c53926312350573a00f7bb0241
tree3665aab0650e00b6eee3c5a924e32fb2457d9bde
parentff73a3e6fd8ae56fada5050821e60df2b292fdbe
parent6243d890f6518bafc92d0ffe39095892f600ec21
Merge branch 'master' into perso : VCS par variable

Conflicts:
.bashrc
.bashrc