]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dj1.6' of github.com:Parisson/Telemeta into dj1.6
authorThomas Fillon <thomas@parisson.com>
Thu, 20 Nov 2014 16:42:19 +0000 (17:42 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 20 Nov 2014 16:42:19 +0000 (17:42 +0100)

Trivial merge