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

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

b3b50315bce812cb8d3f9f1e6b9a2b7f0e371821