From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 17 Nov 2014 17:54:36 +0000 (+0100)
Subject: Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
X-Git-Tag: 1.5.0rc1~27^2~4^2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dedb2221f546b581d99c4267426f6418f94a2522;p=telemeta.git

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

dedb2221f546b581d99c4267426f6418f94a2522