]> 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, 20 May 2013 20:39:54 +0000 (22:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 May 2013 20:39:54 +0000 (22:39 +0200)

Trivial merge