From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 2 Jan 2014 09:44:18 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=80aedd4e784df639928f6b8afed2673bfcfecb93;p=telemeta.git

Merge branch 'dev' into crem2
---

80aedd4e784df639928f6b8afed2673bfcfecb93