From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 5 Nov 2015 16:34:07 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
X-Git-Tag: 1.6b~7^2~56^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=95a4416cf948f26507c4eaecbfcffc5d861ed7f8;p=telemeta.git

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

95a4416cf948f26507c4eaecbfcffc5d861ed7f8