From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 28 Nov 2014 17:15:57 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:parisson/TimeSide into dev
X-Git-Tag: 0.7^2~43
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bccfa5d450769370d38b632796dad10d34b4b89b;p=timeside.git

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

bccfa5d450769370d38b632796dad10d34b4b89b