From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 15 Dec 2014 16:24:35 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~38^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=512c7b5a7ee49e181a6b58d69eb33748a213fe46;p=timeside.git

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

512c7b5a7ee49e181a6b58d69eb33748a213fe46