From: yomguy <yomguy@parisson.com>
Date: Tue, 31 Jul 2012 23:28:34 +0000 (+0200)
Subject: Merge branch 'hotfix/blank'
X-Git-Tag: blank^0
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d5771e0e62a1f21c8da0d11fa43e7365e9a12403;p=teleforma.git

Merge branch 'hotfix/blank'
---

d5771e0e62a1f21c8da0d11fa43e7365e9a12403