]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:33:27 +0000 (22:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Jun 2014 20:33:27 +0000 (22:33 +0200)

Trivial merge