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

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

0bb5b26070322ea3b1d6f7267c2394f4f00b59b3