From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 23 Nov 2014 23:26:16 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/Telemeta into dev
X-Git-Tag: 1.5.0rc1~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dfc38ae0e16c272d7d0abd55f2b83847c0437a04;p=telemeta.git

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

dfc38ae0e16c272d7d0abd55f2b83847c0437a04