]> 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>
Mon, 30 Dec 2013 22:11:09 +0000 (23:11 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Dec 2013 22:11:09 +0000 (23:11 +0100)

Trivial merge