From: Mathieu <mathieu.boye28@gmail.com>
Date: Wed, 30 Mar 2016 07:47:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: 1.6.2^2~15^2~10^2~33
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=29426aa65e70bdd9e70b9e64443193a99999bfe1;p=telemeta.git

Merge remote-tracking branch 'upstream/dev' into dev
---

29426aa65e70bdd9e70b9e64443193a99999bfe1