From: yomguy <yomguy@parisson.com>
Date: Wed, 20 Jun 2012 08:50:52 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.6~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2dbee13f68411f744ee5b20e5fc6c546aedf154f;p=teleforma.git

Merge branch 'dev'
---

2dbee13f68411f744ee5b20e5fc6c546aedf154f