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

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

3abf637039a66f100ee4a46f2f9fd4339bb0fbe3