From: Vincent Le Gallic <legallic@crans.org>
Date: Fri, 25 Dec 2015 01:28:25 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=e00d77b327fb6f825380202a6a50d77e20d57609;hp=fd2a41f3d1024d8b62d25713b82e2720e1b60762

Merge branch 'master' into perso
---