From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:48:04 +0000 (+0200)
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~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8a17eac1a510f0cc5bf2bf4bd8aa75af7a8365c6;p=telemeta.git

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

8a17eac1a510f0cc5bf2bf4bd8aa75af7a8365c6