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

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

aa1333dc3d143792ccfa6b93c0dff05296bae10d