From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 29 Sep 2013 12:26:27 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;ds=inline;h=2f78d3536293e7941c2a123f24dfe40771e2537b;hp=-c;p=config-20-100.git

Merge branch 'master' into perso
---

2f78d3536293e7941c2a123f24dfe40771e2537b