]> 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, 4 Jul 2014 12:04:10 +0000 (14:04 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 4 Jul 2014 12:04:10 +0000 (14:04 +0200)

Trivial merge