From: yomguy <yomguy@parisson.com>
Date: Fri, 27 Apr 2012 11:12:12 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~24^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dc2f026a09ee3dbcd084a6410ca0855ce793d889;p=telemeta.git

Merge branch 'master' into crem
---

dc2f026a09ee3dbcd084a6410ca0855ce793d889