From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Jan 2014 15:15:46 +0000 (+0100)
Subject: Merge branch 'crem2' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=06c1a1881d1567ee92b5fd4cefb9caae56093d83;p=telemeta.git

Merge branch 'crem2' into diadems
---

06c1a1881d1567ee92b5fd4cefb9caae56093d83