]> git.parisson.com Git - telecaster-server.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-server into dev
authoryomguy <yomguy@parisson.com>
Mon, 15 Jul 2013 22:39:25 +0000 (00:39 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 15 Jul 2013 22:39:25 +0000 (00:39 +0200)

Trivial merge