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

Merge branch 'master' into develop
---

d24c827d706bd02f5a36eb41d90a82fb8c9e3d63