From: yomguy <yomguy@parisson.com>
Date: Tue, 19 Jun 2012 18:14:54 +0000 (+0200)
Subject: Merge branch 'release/0.5.4'
X-Git-Tag: 0.5.4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=51fd8642a2ea07d7a0eb66cc19bef658852b1e50;p=teleforma.git

Merge branch 'release/0.5.4'
---

7c7759d2e6abeaa749099cf307eea3052ab5ec86