From: Vincent Le Gallic <legallic@crans.org>
Date: Sun, 18 Aug 2013 11:10:57 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;ds=sidebyside;h=611906ce1639c4962d3d4c02f633b1210bea6dc2;hp=--cc;p=config-20-100.git

Merge branch 'master' into perso
---

611906ce1639c4962d3d4c02f633b1210bea6dc2