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

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

6300cad1bfee53bb70411527f233c12685d43ae5