From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 17 Apr 2015 16:24:09 +0000 (+0200)
Subject: Merge branch 'feature/haystack' into dev
X-Git-Tag: 1.6a^2~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6a3b7a7743c0b7e7e4562d65f20466624d46ab4d;p=telemeta.git

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

6a3b7a7743c0b7e7e4562d65f20466624d46ab4d