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

Trivial merge