]> git.parisson.com Git - telecaster-server.git/commitdiff
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 21:40:11 +0000 (23:40 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 21:40:11 +0000 (23:40 +0200)

Trivial merge