From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 13 Apr 2016 17:01:25 +0000 (+0200)
Subject: Merge branch 'dev' into feature/ts-server
X-Git-Tag: 1.6.2^2~42^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b1453079840cb3c0ae9a303fc464ab04d55af86b;p=telemeta.git

Merge branch 'dev' into feature/ts-server
---

b1453079840cb3c0ae9a303fc464ab04d55af86b