From: Vincent Le Gallic <legallic@crans.org>
Date: Mon, 9 Dec 2013 16:32:25 +0000 (+0100)
Subject: Merge ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=fb1b3540ff05cfd4b5a23522054b7a8715e8e0a4;hp=fb1b3540ff05cfd4b5a23522054b7a8715e8e0a4;p=config-20-100.git

Merge ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso

Conflicts:
	.bash_aliases
---