From: yomguy <yomguy@parisson.com>
Date: Fri, 4 May 2012 14:56:03 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 1.4.3-2^2~30
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=733baa08e4682655d6fe6dba83e0436c01b829f4;p=telemeta.git

Merge branch 'master' into develop
---

733baa08e4682655d6fe6dba83e0436c01b829f4