From: Vincent Le Gallic Date: Fri, 23 Aug 2013 21:26:14 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=6de4f3c282e644af97b1a977eab70ebed869f458 Merge branch 'master' into perso --- 6de4f3c282e644af97b1a977eab70ebed869f458