From: Kaltar5679 <killian.mary@outlook.fr>
Date: Thu, 23 Apr 2015 08:39:06 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~90^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9210cce93f053512094a64a14e7757ed9237f941;p=telemeta.git

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

9210cce93f053512094a64a14e7757ed9237f941