From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 26 Jun 2015 00:09:08 +0000 (+0200)
Subject: Merge branch 'dev' into feature/haystack
X-Git-Tag: 1.6a^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8308cc5b133db7850efac9c8e3e99d7ef3890a4d;p=telemeta.git

Merge branch 'dev' into feature/haystack
---

8308cc5b133db7850efac9c8e3e99d7ef3890a4d