From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 19:15:37 +0000 (+0200)
Subject: Merge branch 'release/0.7-dev'
X-Git-Tag: 0.7.1-dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=260808fda21eeff740f777523ba2724ca0158fb4;p=teleforma.git

Merge branch 'release/0.7-dev'
---

fa592c25c016361bd13b55b0f64769c53e68607a