From: afilsaime <shadow_kungfu@hotmail.fr>
Date: Wed, 6 May 2015 14:00:40 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~68
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=80f8fc2d2c9c6bd61a0dea9ad3c7a2376a73d961;p=telemeta.git

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

80f8fc2d2c9c6bd61a0dea9ad3c7a2376a73d961