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

Merge branch 'master' into dev
---

20ef7d80a27aceda8f8266b7404d0b37a7ecf7ca