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-Url: https://git.parisson.com/?a=commitdiff_plain;h=64b075e2543ec7869bbc359440fe71a05e819b26;p=timeside-diadems.git

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