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

Merge branch 'master' into dev
---

52fd8cc3e3215bdc2220b4207ba2aa6538a8561c