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

Merge branch 'dev' into crem2
---

d300ac3c92749780434bb0f33c4b73afbba3380d