From: yomguy <yomguy@parisson.com>
Date: Tue, 31 Jul 2012 23:28:56 +0000 (+0200)
Subject: Merge branch 'hotfix/blank' into dev
X-Git-Tag: 0.8.5~7^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6746cd0e0d68cebfc530930979e3d6d2ca4940a2;p=teleforma.git

Merge branch 'hotfix/blank' into dev
---

6746cd0e0d68cebfc530930979e3d6d2ca4940a2