]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 22 Jan 2016 16:48:23 +0000 (17:48 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 22 Jan 2016 16:48:23 +0000 (17:48 +0100)

Trivial merge