From: yomguy <yomguy@parisson.com>
Date: Wed, 2 May 2012 14:33:40 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 1.4.3-2^2~31
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d6cfb3ef964ce69fe80a44f542711bf390411e1;p=telemeta.git

Merge branch 'master' into develop
---

7d6cfb3ef964ce69fe80a44f542711bf390411e1