From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 31 Jan 2014 16:48:00 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.6~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=15e6bc11c3767bb0b54a89955be939690c9bf403;p=telemeta.git

Merge branch 'dev'
---

15e6bc11c3767bb0b54a89955be939690c9bf403