]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Sep 2014 23:53:01 +0000 (01:53 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Sep 2014 23:53:01 +0000 (01:53 +0200)

Trivial merge