]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Dec 2014 23:38:08 +0000 (00:38 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Dec 2014 23:38:08 +0000 (00:38 +0100)

Trivial merge