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

Merge branch 'dev'
---

5270e8b3d8829de8baba109185a07a7d15a1bb98