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

Merge branch 'master' into dev
---

e14227209227d8828206f77a87fd1e2f9221d176