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

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

9285cef2638d703b19f7a4af0f8f83614eb99fe3