]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Dec 2013 16:27:14 +0000 (17:27 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Dec 2013 16:27:14 +0000 (17:27 +0100)

Trivial merge