From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 10 Nov 2014 14:57:42 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.7^2~48^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=28738b8c8b1de87b9be87dab021af60a8ff26fa2;p=timeside.git

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

28738b8c8b1de87b9be87dab021af60a8ff26fa2