]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jan 2016 20:14:35 +0000 (21:14 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jan 2016 20:14:35 +0000 (21:14 +0100)

Trivial merge