From: yomguy <yomguy@parisson.com>
Date: Fri, 18 Nov 2011 14:08:08 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~26
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=74c297820a372b53dd0d8e570cdb985201459c73;p=telemeta.git

Merge branch 'master' into crem
---

74c297820a372b53dd0d8e570cdb985201459c73