From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 18 Feb 2015 21:57:37 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.1~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d60a3e0963cc41bbe1c524f55b2e20fd4ff370fd;p=telemeta.git

Merge branch 'dev'
---

d60a3e0963cc41bbe1c524f55b2e20fd4ff370fd