From: afilsaime <shadow_kungfu@hotmail.fr>
Date: Thu, 23 Apr 2015 09:47:47 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~88
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4f701892f5e99c01b338ceee4f98eade75a48d1f;p=telemeta.git

Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
---

4f701892f5e99c01b338ceee4f98eade75a48d1f