From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 30 Jun 2014 10:34:16 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~77
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=22b4e698229ceb;p=timeside.git

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

22b4e698229ceb091d5bf5bc22d9a028909f96cd