From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 3 Mar 2014 17:37:11 +0000 (+0100)
Subject: Merge branch 'crem' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e8af4280028778116089054cf3a12e4f0e71c2e0;p=telemeta.git

Merge branch 'crem' into diadems
---

e8af4280028778116089054cf3a12e4f0e71c2e0