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

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

f662015023f727376269e7e97808dfaed1de1017