From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 11 Sep 2014 23:49:52 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c4980d54cf8affad1b58e25297cdf8edb968327;p=telemeta.git

Merge branch 'dev'
---

0c4980d54cf8affad1b58e25297cdf8edb968327