]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 1 Sep 2015 12:20:23 +0000 (14:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 1 Sep 2015 12:20:23 +0000 (14:20 +0200)

Trivial merge