]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:13:57 +0000 (11:13 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Sep 2014 09:13:57 +0000 (11:13 +0200)

Trivial merge