]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' 1.4.6-1
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 18 Nov 2014 08:51:59 +0000 (09:51 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 18 Nov 2014 08:51:59 +0000 (09:51 +0100)

Trivial merge