From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 15:04:08 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.3~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c9a4c2df00f38fd68738c7dc7a8ef892f1fcaed6;p=timeside.git

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

c9a4c2df00f38fd68738c7dc7a8ef892f1fcaed6