From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 20:15:13 +0000 (+0200)
Subject: Merge branch 'hotfix/0.7.1-dev' into dev
X-Git-Tag: 0.7.1~5^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=867bf98a324b5b503cf40472b2aeb992163bbdeb;p=teleforma.git

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

867bf98a324b5b503cf40472b2aeb992163bbdeb