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

Merge branch 'master' into crem
---

a6a58a42ca11cfdb3fa9a5079c87984d2261dabe