From: yomguy <yomguy@parisson.com>
Date: Tue, 8 Jan 2013 10:00:43 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide
X-Git-Tag: 0.4.3~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7f95551f995bd6d89d7592fbaeae594342733d9f;p=timeside.git

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

7f95551f995bd6d89d7592fbaeae594342733d9f