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

Merge branch 'master' into dev
---

3b631ab81ed30a0a041c7e063fc7dddf3984bc05