From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 14:10:21 +0000 (+0200)
Subject: Merge branch 'hotfix/manifest'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8770997ffb838af1f5c773f93195dfe4f7240e37;p=timeside-diadems.git

Merge branch 'hotfix/manifest'
---

8770997ffb838af1f5c773f93195dfe4f7240e37