From: Vincent Le Gallic <legallic@crans.org>
Date: Thu, 24 Dec 2015 21:01:37 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=2f8ffc274b765dcc8d1968745a6a412001ab3fcc

Merge branch 'master' into perso

Conflicts:
	.bash_aliases
---

2f8ffc274b765dcc8d1968745a6a412001ab3fcc