From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 23 Oct 2015 10:56:09 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
X-Git-Tag: 1.6b~7^2~56^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8440ce64429700e1e945818188f482a283534bbb;p=telemeta.git

Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
---

8440ce64429700e1e945818188f482a283534bbb