From: Guillaume Pellerin Date: Tue, 22 Dec 2015 15:45:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3a0ee3918ba1d2eaa079f5f501adb254635ed834;p=telemeta.git Merge remote-tracking branch 'origin/dev' into crem --- 3a0ee3918ba1d2eaa079f5f501adb254635ed834