From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 14:06:49 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~54
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=819a2faf1d1552d186a66dda211a9f1e83e97071;p=telemeta.git

Merge branch 'master' into crem
---

819a2faf1d1552d186a66dda211a9f1e83e97071