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

Merge branch 'master' into perso
---