From: yomguy <yomguy@parisson.com>
Date: Tue, 5 Jun 2012 01:08:44 +0000 (+0200)
Subject: Merge branch 'release/0.4' into dev
X-Git-Tag: 0.5^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=be803dda84a97150837f7359692258c5307acd09;p=teleforma.git

Merge branch 'release/0.4' into dev
---

be803dda84a97150837f7359692258c5307acd09