From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:02:27 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.4.1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9d9cad12dd21a564bc671cb1ea8a2f2fbd733d10;p=timeside.git

Merge branch 'master' into dev
---

9d9cad12dd21a564bc671cb1ea8a2f2fbd733d10