]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 22 Dec 2015 15:45:48 +0000 (16:45 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 22 Dec 2015 15:45:48 +0000 (16:45 +0100)

Trivial merge