From: yomguy <yomguy@parisson.com>
Date: Mon, 11 Jun 2012 14:40:02 +0000 (+0200)
Subject: Merge branch 'release/0.5.2'
X-Git-Tag: 0.5.2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aa996007bddfdd985b1d38265f685b2a7cfaf616;p=teleforma.git

Merge branch 'release/0.5.2'
---

48fcff1d6069bf61806157f7586d724e8c8709e8