From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 15 Dec 2014 16:36:05 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.0rc3~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9f6d02697d225c92e2e82b583f147e26a4fdc0a4;p=telemeta.git

Merge branch 'master' into dev
---

9f6d02697d225c92e2e82b583f147e26a4fdc0a4