From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 8 Jan 2014 22:45:57 +0000 (+0100)
Subject: Merge branch 'crem2' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fd9ce03cc1c1e479c7a0df64fd524e8de9a2de8f;p=telemeta.git

Merge branch 'crem2' into diadems
---

fd9ce03cc1c1e479c7a0df64fd524e8de9a2de8f