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

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

2f8bea284a63f8da33876b1754b5ac9b491a1b44