From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 28 Apr 2016 09:35:09 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.2^2~30^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=81b998de3721a4d9f5713ee88ec66f816b668954;p=telemeta.git

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

81b998de3721a4d9f5713ee88ec66f816b668954