From: Guillaume Pellerin Date: Thu, 25 Oct 2012 15:12:09 +0000 (+0200) Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/timeside X-Git-Tag: 0.5.3~16^2~1^2~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b066d12d2daffcb349123c60455ce4b129a5e76;p=timeside.git Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/timeside --- 2b066d12d2daffcb349123c60455ce4b129a5e76