]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 5 Mar 2014 10:50:08 +0000 (11:50 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 5 Mar 2014 10:50:08 +0000 (11:50 +0100)

Trivial merge