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

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

3970be0538faf288b989171a0103e62f33614d01