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

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

24090cdc70d572138d8a12b03fec61590c334b35