From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 20 Oct 2013 16:34:49 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.1-0~29
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=afa29d7fe9095d769094d6037e80aebf3851e46d;p=timeside.git

Merge branch 'master' into dev
---

afa29d7fe9095d769094d6037e80aebf3851e46d