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

Trivial merge