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

Merge branch 'hotfix/manifest'
---

c9c31a9861a918aa862cba85f2ab6941ba8f3e63