From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 May 2013 09:55:36 +0000 (+0200)
Subject: Merge branch 'crem2' into diadems
X-Git-Tag: 1.5.0rc3~46^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=155611d6021a0b51b0122d5ce80d13d115e6f43e;p=telemeta.git

Merge branch 'crem2' into diadems
---

155611d6021a0b51b0122d5ce80d13d115e6f43e