]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 27 May 2014 10:19:49 +0000 (12:19 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 27 May 2014 10:19:49 +0000 (12:19 +0200)

Trivial merge