]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 16:09:03 +0000 (17:09 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 16:09:03 +0000 (17:09 +0100)

Trivial merge