From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 2 Jun 2017 16:46:22 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=06b7a74b8ae86444bfde87fab4266300564b2415;p=telemeta.git

Merge branch 'dev' into crem
---

06b7a74b8ae86444bfde87fab4266300564b2415