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

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

1d827b7be02f222aee69ffb763c6767e6826cca8