From: mathieu <mathieu.boye28@gmail.com>
Date: Tue, 17 May 2016 13:23:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/devinstable' into dev
X-Git-Tag: 1.6.2^2~15^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fe6e2bdb81c245fbebb0d37064f835cd7f9cb600;p=telemeta.git

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

fe6e2bdb81c245fbebb0d37064f835cd7f9cb600