]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Dec 2015 23:21:24 +0000 (00:21 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Dec 2015 23:21:24 +0000 (00:21 +0100)

Trivial merge