From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 24 Aug 2017 16:52:05 +0000 (+0200)
Subject: Merge pull request #191 from Parisson/master
X-Git-Tag: 1.6.4^2~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b781d7436a9bc03dea07e9402eb1f8939a00f88;p=telemeta.git

Merge pull request #191 from Parisson/master

Merge master into Dev
---

2b781d7436a9bc03dea07e9402eb1f8939a00f88