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

Merge branch 'master' into dev
---

05d6f9e375fbf8d47e4877de051e34467b03ca70