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

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

a27363fd59e3d3cfbaa967bb5ed1641ecdb0949a