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

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

652086918821b3e83e066f64a6d5cb4775c0d7a1