From: Kaltar5679 <killian.mary@outlook.fr>
Date: Thu, 25 Jun 2015 11:55:53 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=621069395a62049202a9a331bccf04ecfffcf2d6;p=telemeta.git

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

621069395a62049202a9a331bccf04ecfffcf2d6