]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:21:15 +0000 (17:21 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:21:15 +0000 (17:21 +0100)

Trivial merge