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-Tag: 0.5.3~16^2~1^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=da8226d91bb7ff5ac90e41a4e2cef55e8fed83d4;p=timeside.git

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

da8226d91bb7ff5ac90e41a4e2cef55e8fed83d4