From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 23:56:02 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
X-Git-Tag: 0.5.3~16^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=708b7b243c08aaffa83bd722117a21a5f43796d0;p=timeside.git

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

708b7b243c08aaffa83bd722117a21a5f43796d0