]> git.parisson.com Git - telecaster-server.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 5 Dec 2013 00:10:28 +0000 (01:10 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 5 Dec 2013 00:10:28 +0000 (01:10 +0100)

Trivial merge