]> git.parisson.com Git - telecaster-client.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
authoryomguy <yomguy@parisson.com>
Tue, 17 Jul 2012 17:03:21 +0000 (19:03 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 17 Jul 2012 17:03:21 +0000 (19:03 +0200)

Trivial merge