From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 6 Jan 2014 15:52:28 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a2cac8f1b6954e7d91c13d013e12f4fd27a635d0;p=telemeta.git

Merge branch 'dev' into crem2
---

a2cac8f1b6954e7d91c13d013e12f4fd27a635d0