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

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

e838c9f217d9695542b3a4ec756458a45d08acc7