]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 31 Aug 2015 10:01:22 +0000 (12:01 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 31 Aug 2015 10:01:22 +0000 (12:01 +0200)

Trivial merge