From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 20 Nov 2014 16:42:19 +0000 (+0100)
Subject: Merge branch 'dj1.6' of github.com:Parisson/Telemeta into dj1.6
X-Git-Tag: 1.5.0rc1~27^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=48eac332114e2109453bbb46d755ddbd754339c6;p=telemeta.git

Merge branch 'dj1.6' of github.com:Parisson/Telemeta into dj1.6
---

48eac332114e2109453bbb46d755ddbd754339c6