From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 14 Oct 2013 12:49:27 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~43
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c14e64625be7095112901a5addab05313ba19014;p=telemeta.git

Merge branch 'dev' into crem2
---

c14e64625be7095112901a5addab05313ba19014