From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 20 Oct 2013 00:20:58 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=834ef2e6420aa415917d2eb0d84d964f7543f4e5;p=config-20-100.git

Merge branch 'master' into perso
---

834ef2e6420aa415917d2eb0d84d964f7543f4e5