From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Apr 2015 15:38:01 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6a^2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=30ce8a4d72154e60a8d994b92302acd8efafcf66;p=telemeta.git

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

30ce8a4d72154e60a8d994b92302acd8efafcf66