From: Kaltar5679 <killian.mary@outlook.fr>
Date: Tue, 12 May 2015 13:46:42 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~58
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3451e6c3b7f1f2e28183dbe5488259ce0913196e;p=telemeta.git

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

3451e6c3b7f1f2e28183dbe5488259ce0913196e