]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 00:44:51 +0000 (01:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 00:44:51 +0000 (01:44 +0100)

Trivial merge