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

Merge branch 'master' into dev
---

d253b65f1bbead8f48b0b974f10739f223681522