From: mathieu <mathieu.boye28@gmail.com>
Date: Wed, 11 May 2016 09:12:24 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
X-Git-Tag: 1.6.2^2~15^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5b3eed44c4193c60be140d698e8f6ad234a9b6ac;p=telemeta.git

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

5b3eed44c4193c60be140d698e8f6ad234a9b6ac