From: yomguy <yomguy@parisson.com>
Date: Wed, 21 Mar 2012 13:44:33 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bf87cda205e2bb09a61a8ddc1fe3ffae2f4b62ab;p=telemeta.git

Merge branch 'master' into dev
---

bf87cda205e2bb09a61a8ddc1fe3ffae2f4b62ab