From: Vincent Le Gallic <legallic@crans.org>
Date: Fri, 12 Feb 2016 05:20:56 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=00e4322c262212edd85e1bcea1198c1393f85fca;hp=7c04335886b0099751203e7fc886d9b2f9eba1d9

Merge branch 'master' into perso
---