From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Dec 2014 23:38:08 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc4~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e55fe12591dfdc758c0867920f7a52d6479ec495;p=telemeta.git

Merge branch 'dev' into crem2
---

e55fe12591dfdc758c0867920f7a52d6479ec495