From: Guillaume Pellerin 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-Tag: 0.5.3~16^2~1^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e1d91737977fe27153c2ae3cd549b286d88295e;p=timeside.git Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside --- 0e1d91737977fe27153c2ae3cd549b286d88295e