From: yomguy <yomguy@parisson.com>
Date: Tue, 12 Feb 2013 12:29:01 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 0.4.3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5e6310a82f136c7ebbd666858400132b1a456ca1;p=timeside.git

Merge branch 'dev'
---

5e6310a82f136c7ebbd666858400132b1a456ca1