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

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

a12e95dc8b995308e9fd1d11a12a02f9413a6601