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

Merge branch 'dev'
---

d8fefc74117d9cc38afa1fb85110a05c2d330eaf