From: Vincent Le Gallic <legallic@crans.org>
Date: Sat, 5 Apr 2014 21:44:16 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=39fae3a3633300d0f0bddb42e5c60533a3a1f113;hp=89e2ce95a01dbc21865c91beebdf7c7647bfe74b;p=config-20-100.git

Merge branch 'master' into perso

Conflicts:
	.bashrc
---

diff --git a/.bashrc b/.bashrc
index 622af0e..8f68617 100644
--- a/.bashrc
+++ b/.bashrc
@@ -299,6 +299,7 @@ function welcome_message ()
 ### ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ###
 ### Attention à ce que vous avez édité dans cette section ###
 
+
 # +---------------------------------------+
 # | Gestion de l'historique des commandes |
 # +---------------------------------------+