From: yomguy <yomguy@parisson.com>
Date: Wed, 19 Sep 2012 09:26:40 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.3.3^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1fc930bdbd1e7d96a1c409b99f7e8077d9dbe5da;p=timeside.git

Merge branch 'master' into dev
---

1fc930bdbd1e7d96a1c409b99f7e8077d9dbe5da