From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Apr 2013 10:24:00 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1c74068bc3574bc78703506e35041c920b3e34b3;p=timeside-diadems.git

Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
---

1c74068bc3574bc78703506e35041c920b3e34b3