From: yomguy <yomguy@parisson.com>
Date: Tue, 27 Mar 2012 15:46:32 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b0fab0a152fc91989e1e8d3912c384675ad5fe24;p=telemeta.git

Merge branch 'master' into dev
---

b0fab0a152fc91989e1e8d3912c384675ad5fe24