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

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

2a9449dd7157417453ef5be0252f738618f9466d