From: Valentin Samir <samir@crans.org>
Date: Mon, 22 Jul 2013 15:42:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.crans.org/git/fichiers_configuration
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;ds=sidebyside;h=2bfae2c7456c6956ce42bc8db17cd21af2365dd9;p=config-20-100.git

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

2bfae2c7456c6956ce42bc8db17cd21af2365dd9