From: yomguy <yomguy@parisson.com>
Date: Thu, 29 Mar 2012 12:31:29 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0cffd4172011b15e79ab38df9e49a6b96f8cc6a7;p=telemeta.git

Merge branch 'master' into crem
---

0cffd4172011b15e79ab38df9e49a6b96f8cc6a7