From: mathieu <mathieu.boye28@gmail.com>
Date: Thu, 28 Apr 2016 13:24:26 +0000 (+0200)
Subject: Merge Parisson/Telemeta/dev
X-Git-Tag: 1.6.2^2~15^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=940a4554aea01bebfb99747ccac30c66e06b12a5;p=telemeta.git

Merge Parisson/Telemeta/dev
---

940a4554aea01bebfb99747ccac30c66e06b12a5