From: Vincent Le Gallic <legallic@crans.org>
Date: Mon, 31 Mar 2014 19:19:21 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=132f236bd58b95918b931de4e141a297597c1e27;p=config-20-100.git

Merge branch 'master' into perso
---

132f236bd58b95918b931de4e141a297597c1e27
diff --cc .bashrc
index 7717833,057bd56..6df39e2
--- a/.bashrc
+++ b/.bashrc
@@@ -349,6 -355,11 +354,11 @@@ if [ -f ~/.bash_aliases_local ]; the
      . ~/.bash_aliases_local
  fi
  
+ 
+ # +-----+
+ # | End |
+ # +-----+
+ 
  # On n'exécute le welcome_message que à ce moment, parce que la customisation
 -# local a pu changer des couleurs
 +# locale a pu changer des couleurs
  welcome_message