From: Kaltar5679 <killian.mary@outlook.fr>
Date: Mon, 15 Jun 2015 09:14:35 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=54934c5d55bdae345e50c9d0bff5c702a059a2e7;p=telemeta.git

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

54934c5d55bdae345e50c9d0bff5c702a059a2e7