From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 1 May 2015 14:43:35 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6a~4^2~92
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=14734b86bc441da36d3f6e3d4001dcbc46bba431;p=telemeta.git

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

14734b86bc441da36d3f6e3d4001dcbc46bba431