From: yomguy <yomguy@parisson.com>
Date: Wed, 4 Apr 2012 08:22:55 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6a6127e00bd947b5b65a264c41f06315d7ab6728;p=telemeta.git

Merge branch 'master' into dev
---

6a6127e00bd947b5b65a264c41f06315d7ab6728