From: yomguy <yomguy@parisson.com>
Date: Tue, 10 Jul 2012 13:21:28 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.7-dev~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd1a59dcdbe4854829f7447022a23f003ed38699;p=teleforma.git

Merge branch 'dev'
---

cd1a59dcdbe4854829f7447022a23f003ed38699