From: yomguy <yomguy@parisson.com>
Date: Thu, 5 Jul 2012 17:19:14 +0000 (+0200)
Subject: Merge branch 'dev' into feature/blue
X-Git-Tag: 0.6^2~6^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1bd3ce038f4486bbb7980d00eb72b59ef1e2f603;p=teleforma.git

Merge branch 'dev' into feature/blue
---

1bd3ce038f4486bbb7980d00eb72b59ef1e2f603