]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/timeside
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 25 Oct 2012 15:12:09 +0000 (17:12 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 25 Oct 2012 15:12:09 +0000 (17:12 +0200)

Trivial merge