From: afilsaime <shadow_kungfu@hotmail.fr>
Date: Wed, 10 Jun 2015 14:10:28 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d377c3d0e220321db986252ea00aa59874ab058;p=telemeta.git

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

7d377c3d0e220321db986252ea00aa59874ab058