From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 27 May 2014 09:15:08 +0000 (+0200)
Subject: Merge branch 'crem' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0b8bd4656231307e3da16a10094458345660c9c2;p=telemeta.git

Merge branch 'crem' into diadems
---

0b8bd4656231307e3da16a10094458345660c9c2