From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 20 Nov 2014 14:51:06 +0000 (+0100)
Subject: Merge dj1.6 into dj1.6-tests
X-Git-Tag: 1.5.0rc1~27^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=73549728203c8be20b967d15bdf55d0d2d4d1ee4;p=telemeta.git

Merge dj1.6 into dj1.6-tests
---

73549728203c8be20b967d15bdf55d0d2d4d1ee4