From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 7 Feb 2014 08:22:32 +0000 (+0100)
Subject: Merge branch 'master' of github.com:yomguy/Telemeta
X-Git-Tag: 1.4.6~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0f16bbe1286db0d3667ccd87773ff4be5b7b17e7;p=telemeta.git

Merge branch 'master' of github.com:yomguy/Telemeta
---

0f16bbe1286db0d3667ccd87773ff4be5b7b17e7