From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 4 Mar 2014 08:37:52 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~3^2^2~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5672d88b5b8c7e30133f6796f023c6de8390e1d3;p=timeside.git

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

5672d88b5b8c7e30133f6796f023c6de8390e1d3