From: Kaltar5679 <killian.mary@outlook.fr>
Date: Fri, 22 May 2015 12:33:45 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~48
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=501e33398602c1a83094cec0ae52d1b373092e3b;p=telemeta.git

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

501e33398602c1a83094cec0ae52d1b373092e3b