]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 15:39:39 +0000 (17:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 15:39:39 +0000 (17:39 +0200)

Trivial merge