]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'master' of github.com:Parisson/Telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Jun 2014 20:54:51 +0000 (22:54 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Jun 2014 20:54:51 +0000 (22:54 +0200)

Trivial merge