From: yomguy <yomguy@parisson.com>
Date: Tue, 3 Apr 2012 10:47:16 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~28^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=77a3c084f53318f7dbdf4181054ab60b73191912;p=telemeta.git

Merge branch 'master' into crem
---

77a3c084f53318f7dbdf4181054ab60b73191912