From: Vincent Le Gallic <legallic@crans.org>
Date: Thu, 25 Jul 2013 23:54:07 +0000 (+0200)
Subject: Merge branch 'master' into perso : VCS par variable
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=9b2ac25dff2033c53926312350573a00f7bb0241

Merge branch 'master' into perso : VCS par variable

Conflicts:
	.bashrc
---

9b2ac25dff2033c53926312350573a00f7bb0241