From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Feb 2015 10:25:38 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;p=telemeta.git

Merge branch 'dev'
---

b3fd5a01589fa5c202f2739afe6d9650ffe3d9d8