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

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

f46765ee0ce5fa5e47ce08f5b8c51fbfaa0d8218