From: Guillaume Pellerin Date: Mon, 21 Dec 2015 23:21:24 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=34464a795a28d8a8043127c04e49f8711d0ace47;p=telemeta.git Merge remote-tracking branch 'origin/dev' into crem --- 34464a795a28d8a8043127c04e49f8711d0ace47