From: mathieu <mathieu.boye28@gmail.com>
Date: Thu, 19 May 2016 12:01:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/devinstable' into dev
X-Git-Tag: 1.6.2^2~15^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0461414adcaa246fc111b7fb846ddd3ed53b6a3d;p=telemeta.git

Merge remote-tracking branch 'origin/devinstable' into dev
---

0461414adcaa246fc111b7fb846ddd3ed53b6a3d