From: Valentin Samir <samir@crans.org>
Date: Fri, 26 Jul 2013 22:48:06 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.crans.org/git/fichiers_configuration
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=e72a11e41284f0feb723a38034fc68f320715b46

Merge branch 'master' of ssh://git.crans.org/git/fichiers_configuration
---

e72a11e41284f0feb723a38034fc68f320715b46