From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 11 Sep 2014 23:53:01 +0000 (+0200)
Subject: Merge branch 'dev' into dj1.6
X-Git-Tag: 1.5.0rc1~27^2~97
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d8a5ac5e6f75d1fc6a97b757f67fd5af9a45ac9b;p=telemeta.git

Merge branch 'dev' into dj1.6
---

d8a5ac5e6f75d1fc6a97b757f67fd5af9a45ac9b