From: Vincent Le Gallic <legallic@crans.org>
Date: Wed, 2 Mar 2016 23:23:51 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=f737a885835fd67718c6414428c9ee399402563a;hp=f737a885835fd67718c6414428c9ee399402563a;p=config-20-100.git

Merge branch 'master' into perso
---