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

Merge branch 'master' into dev
---

16e4e13bb489edb5f1161ee29dd358e73b855e3a