From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 18 Nov 2014 08:51:59 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.6-1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=662006332da58df73844a735c86ba5212d67a53d;p=telemeta.git

Merge branch 'dev'
---

662006332da58df73844a735c86ba5212d67a53d