From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 28 Jun 2013 21:34:54 +0000 (+0200)
Subject: Merge branch 'diadems' into crem2
X-Git-Tag: 1.5.0rc3~46
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6d2ada5ca01c8e611f3aa98eee46c137df84f8dd;p=telemeta.git

Merge branch 'diadems' into crem2
---

6d2ada5ca01c8e611f3aa98eee46c137df84f8dd