From: Guillaume Pellerin Date: Wed, 20 Jan 2016 20:04:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82ff66dffb397a95ff2c3bc82fbf5cddb7cbf8c6;p=telemeta.git Merge remote-tracking branch 'origin/dev' into crem --- 82ff66dffb397a95ff2c3bc82fbf5cddb7cbf8c6