]> git.parisson.com Git - telemeta.git/commitdiff
Merge dj1.6 into dj1.6-tests
authorThomas Fillon <thomas@parisson.com>
Thu, 20 Nov 2014 14:51:06 +0000 (15:51 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 20 Nov 2014 14:51:06 +0000 (15:51 +0100)

Trivial merge