From: afilsaime <shadow_kungfu@hotmail.fr>
Date: Thu, 30 Apr 2015 10:15:07 +0000 (+0200)
Subject: Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
X-Git-Tag: 1.6a^2~15^2~77
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6eb1339e1bb7ab0b27106cf686abba7fa2d44adb;p=telemeta.git

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

6eb1339e1bb7ab0b27106cf686abba7fa2d44adb