From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 08:22:08 +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~21
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2562a081bf73911e029bf4c22c7ce880b3ad3ff5;p=telemeta.git

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

2562a081bf73911e029bf4c22c7ce880b3ad3ff5