From: Guillaume Pellerin 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-Url: https://git.parisson.com/?a=commitdiff_plain;h=c85830438299cc4a686940595f0c8adb42be1097;p=timeside-diadems.git Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside --- c85830438299cc4a686940595f0c8adb42be1097