From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 12 Mar 2015 22:07:26 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6a^2~55
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c118be41c99583c0df3f98ada0471e5689276898;p=telemeta.git

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

c118be41c99583c0df3f98ada0471e5689276898