From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 28 Apr 2014 23:54:10 +0000 (+0200)
Subject: Merge branch 'server' of github.com:yomguy/TimeSide into server
X-Git-Tag: 0.5.5~1^2~37^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4d3e8487915a2fe9177f13d6ac25e0ee239d875d;p=timeside.git

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

4d3e8487915a2fe9177f13d6ac25e0ee239d875d