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

Merge branch 'crem2' into diadems
---

1f29323eee0ebf05dc98fdd91fcb7d85048801ce