]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:31:20 +0000 (16:31 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:31:20 +0000 (16:31 +0100)

Trivial merge