]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 17 Nov 2014 17:54:36 +0000 (18:54 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 17 Nov 2014 17:54:36 +0000 (18:54 +0100)

Trivial merge