From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 22 Oct 2014 13:55:48 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a634959801ad88dc12d7c334958e0ef9403761e3;p=timeside.git

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

a634959801ad88dc12d7c334958e0ef9403761e3