From: yomguy <yomguy@parisson.com>
Date: Fri, 6 Apr 2012 08:19:56 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.3-2~7^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c40285d7657ce9a29f4e677d51abd73a523fb1d2;p=telemeta.git

Merge branch 'master' into dev
---

c40285d7657ce9a29f4e677d51abd73a523fb1d2