]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 15 Jun 2014 20:34:19 +0000 (22:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 15 Jun 2014 20:34:19 +0000 (22:34 +0200)

Trivial merge