From: mathieu <mathieu.boye28@gmail.com>
Date: Tue, 26 Apr 2016 13:05:34 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
X-Git-Tag: 1.6.2^2~15^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7985ddbb5db66ecaea274bb3a4929826ead7106f;p=telemeta.git

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


Former-commit-id: b4f83798aaff98f5838ab87a1784c74a39d5c967
---

7985ddbb5db66ecaea274bb3a4929826ead7106f