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

Merge branch 'master' into dev
---

5018b7d46447aeedfecc4da498f04c6cf3970e53