]> 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>
Fri, 9 Nov 2012 17:33:53 +0000 (18:33 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 9 Nov 2012 17:33:53 +0000 (18:33 +0100)

Trivial merge