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

Merge branch 'master' into dev
---

18b4f7bab4f37119a815cf75763db17f20492f39