From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 20 Nov 2014 16:25:50 +0000 (+0100)
Subject: Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
X-Git-Tag: 1.5.0rc1~27^2~1^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3380445f1d49bb88867feb5ca39504d34cc3f949;p=telemeta.git

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

3380445f1d49bb88867feb5ca39504d34cc3f949