]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 22:07:18 +0000 (00:07 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 14 Oct 2013 22:07:18 +0000 (00:07 +0200)

Trivial merge