]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 08:59:48 +0000 (09:59 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 08:59:48 +0000 (09:59 +0100)

Trivial merge