From: afilsaime Date: Thu, 30 Apr 2015 12:10:23 +0000 (+0200) Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into feature/haystack X-Git-Tag: 1.6a^2~15^2~76 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=41675a4be5ac0b5ef7891ab9d2e152bb8344dad4;p=telemeta.git Merge branch 'dev' of github.com:Parisson/Telemeta into feature/haystack --- 41675a4be5ac0b5ef7891ab9d2e152bb8344dad4