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

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

d38f00a3da11ea6b6b9847f487ff8353940434b8