]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/timeside
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 10:24:00 +0000 (12:24 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 10:24:00 +0000 (12:24 +0200)

Trivial merge