From: Valentin Samir 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/?p=config-20-100.git;a=commitdiff_plain;h=2bfae2c7456c6956ce42bc8db17cd21af2365dd9 Merge branch 'master' of ssh://git.crans.org/git/fichiers_configuration --- 2bfae2c7456c6956ce42bc8db17cd21af2365dd9