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

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

c3f7c8fd544e7fcaa4c41aaed0da80a563062ade