From: mathieu <mathieu.boye28@gmail.com>
Date: Fri, 10 Jun 2016 13:46:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: search~8^2~8^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7a4b0c1b1d5ff6602348e120fa377f6f15b1e7f9;p=telemeta.git

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

7a4b0c1b1d5ff6602348e120fa377f6f15b1e7f9