From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 4 Oct 2017 07:18:17 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.6.4c~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3ce6da5e34a4ad5519799cb477a7d4604f61a392;p=telemeta.git

Merge branch 'master' into dev
---

3ce6da5e34a4ad5519799cb477a7d4604f61a392