From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 21:53:43 +0000 (+0100)
Subject: Merge branch 'feature/ts-0.5' into dev
X-Git-Tag: 1.4.5-1~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d07416217ad1a54373880899cb4c15dc6fefe755;p=telemeta.git

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

d07416217ad1a54373880899cb4c15dc6fefe755