From: yomguy <yomguy@parisson.com>
Date: Thu, 29 Mar 2012 12:31:29 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3130b4d46c8acb7869a7142412b6fcd5c12e78ac;p=telemeta.git

Merge branch 'master' into dev
---

3130b4d46c8acb7869a7142412b6fcd5c12e78ac