From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 16 Dec 2014 14:04:37 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:parisson/TimeSide into dev
X-Git-Tag: 0.7^2~38
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=06712e56e981a498f212edfbd96a9a5586fbbd1d;p=timeside.git

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

06712e56e981a498f212edfbd96a9a5586fbbd1d