]> 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>
Sun, 15 Dec 2013 23:11:36 +0000 (00:11 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 15 Dec 2013 23:11:36 +0000 (00:11 +0100)

Trivial merge