From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 17 Oct 2014 20:00:28 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=139c9f874167a51cca258dd49a771b76202754aa;p=timeside.git

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

139c9f874167a51cca258dd49a771b76202754aa