From: Mathieu <mathieu.boye28@gmail.com>
Date: Thu, 7 Apr 2016 17:20:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: 1.6.2^2~15^2~10^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=df7105dd2f63bacb0d7148b6acfea0aa6b798a86;p=telemeta.git

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

df7105dd2f63bacb0d7148b6acfea0aa6b798a86