From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 18 Jan 2017 12:48:49 +0000 (+0100)
Subject: Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~34
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a01e66b8bf99217897df77a590c412232896624;p=telemeta.git

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

0a01e66b8bf99217897df77a590c412232896624