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

Merge branch 'master' into dev
---

54ee9e20e37b75aabdae5ef5c3117ee8864ed076