]> 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 07:40:50 +0000 (09:40 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 07:40:50 +0000 (09:40 +0200)

Trivial merge