From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 28 Feb 2013 09:27:11 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ef3a8e2491d332fc180f6c4a24346c4d8e4542c8;p=timeside-diadems.git

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

ef3a8e2491d332fc180f6c4a24346c4d8e4542c8