From: afilsaime <shadow_kungfu@hotmail.fr>
Date: Tue, 12 May 2015 13:44:12 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~58^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3e6f6a2901905b96695cef2e997c18de487dbd58;p=telemeta.git

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

3e6f6a2901905b96695cef2e997c18de487dbd58