From: yomguy <yomguy@parisson.com>
Date: Mon, 9 Jul 2012 10:41:55 +0000 (+0200)
Subject: Merge branch 'release/0.6'
X-Git-Tag: 0.6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=af382a2bf34a6b0e61103372be1dcd8f6dabd3a6;p=teleforma.git

Merge branch 'release/0.6'
---

f540878c18f9bdd94788d84d39b6d1effd1d033d