]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Feb 2016 10:07:37 +0000 (11:07 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Feb 2016 10:07:37 +0000 (11:07 +0100)

Trivial merge