]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' master 1.5.1
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Feb 2015 10:25:38 +0000 (11:25 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Feb 2015 10:25:38 +0000 (11:25 +0100)

Trivial merge