From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 26 Jan 2015 00:52:16 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.1~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cb1d07812d69bb9be7676394b6d57dff953c70a5;p=telemeta.git

Merge branch 'dev'
---

cb1d07812d69bb9be7676394b6d57dff953c70a5