From: yomguy <yomguy@parisson.com>
Date: Mon, 11 Jun 2012 09:28:18 +0000 (+0200)
Subject: Merge branch 'hotfix/0.5.1' into dev
X-Git-Tag: 0.5.2^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3889c6c4c3a6bf085699d8d5615a639d16c48d61;p=teleforma.git

Merge branch 'hotfix/0.5.1' into dev
---

3889c6c4c3a6bf085699d8d5615a639d16c48d61