From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 13 Jan 2015 21:56:58 +0000 (+0100)
Subject: Merge branch 'ts_extensions' into dev
X-Git-Tag: 0.7^2~30
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e484c7af3d4e97f81233ff094a7e7d0f2a305de4;p=timeside.git

Merge branch 'ts_extensions' into dev
---

e484c7af3d4e97f81233ff094a7e7d0f2a305de4