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