From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 24 Nov 2011 11:42:21 +0000 (+0100)
Subject: Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~43
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=63954002916273a139235ac99c16701ff76d93cb;p=telemeta.git

Merge branch 'crem' of https://github.com/yomguy/Telemeta into crem
---

63954002916273a139235ac99c16701ff76d93cb