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

Merge branch 'dev' into crem2
---

e5731202675b7734844a38c671a8290f39c6aee2