From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 6 Dec 2013 08:59:48 +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=82972b5e434ca8742869fa22f6e85d35412cc99b;p=timeside-diadems.git

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

82972b5e434ca8742869fa22f6e85d35412cc99b