From: Vincent Le Gallic <legallic@crans.org>
Date: Mon, 9 Dec 2013 17:11:55 +0000 (+0100)
Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... 
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=cad116e307af0185af66952a3ef539577753811d;hp=1708df65cc3731ad01c73ae2493559860aa24f5c;p=config-20-100.git

Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso
---

diff --git a/.bashrc b/.bashrc
index 3d1c3d2..05bb413 100644
--- a/.bashrc
+++ b/.bashrc
@@ -345,5 +345,5 @@ if [ -f ~/.bash_aliases_local ]; then
 fi
 
 # 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