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

Merge branch 'dev'
---

e41a91cffd212da4b6e7239fdb22aaa1627be570