From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 2 Jun 2017 11:37:37 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/Parisson/Telemeta into dev
X-Git-Tag: search~2^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d48b75ffe2dfc3ff22d697aea81a64c18017506e;p=telemeta.git

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

d48b75ffe2dfc3ff22d697aea81a64c18017506e