]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:33:28 +0000 (11:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:33:28 +0000 (11:33 +0200)

Trivial merge