From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Jul 2015 16:31:23 +0000 (+0200)
Subject: Merge branch 'dev' into feature/haystack
X-Git-Tag: 1.6a^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=02b8752f4f9a2457713930b0623f7c1e32538758;p=telemeta.git

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

02b8752f4f9a2457713930b0623f7c1e32538758