From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 19 Jan 2015 08:55:45 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0b4761dd53ee828d5a78cbb48d28a237164a992a;p=timeside.git

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

0b4761dd53ee828d5a78cbb48d28a237164a992a