From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 24 Nov 2011 10:43:04 +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~44
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7b7d75f604838bae413832c5fdc21ba003d9f19d;p=telemeta.git

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

7b7d75f604838bae413832c5fdc21ba003d9f19d