From: mathieu <mathieu.boye28@gmail.com>
Date: Thu, 28 Apr 2016 13:05:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/devinstable' into dev
X-Git-Tag: 1.6.2^2~15^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=203f0b38ed2ae4a871c8c273b001a8319b7fc4d4;p=telemeta.git

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

203f0b38ed2ae4a871c8c273b001a8319b7fc4d4