From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 13 Jun 2013 11:47:37 +0000 (+0200)
Subject: Merge branch 'crem2' into diadems
X-Git-Tag: 1.5.0rc3~46^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=787a8406961b687040b2e6fbce06f8a0fad84eb3;p=telemeta.git

Merge branch 'crem2' into diadems
---

787a8406961b687040b2e6fbce06f8a0fad84eb3