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

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

b63fd7a856f6698c6590e6367ec9ad64595e5a25