]> git.parisson.com Git - telecaster-client.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 16 Jan 2015 15:24:25 +0000 (16:24 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 16 Jan 2015 15:24:25 +0000 (16:24 +0100)

Trivial merge