From: yomguy <yomguy@parisson.com>
Date: Fri, 27 Apr 2012 11:12:12 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=742435dd930cf297389cfdc53da86a7da2bed8a3;p=telemeta.git

Merge branch 'master' into dev
---

742435dd930cf297389cfdc53da86a7da2bed8a3