From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 20 Dec 2013 09:36:45 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e2b5d14fb8f754340e21d9d54622565df864b5a1;p=telemeta.git

Merge branch 'dev' into crem2
---

e2b5d14fb8f754340e21d9d54622565df864b5a1