From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 18 Oct 2013 22:43:24 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.1-0~31
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fd8aa35b354149d3046c2231ef64d4498c6698bf;p=timeside.git

Merge branch 'master' into dev
---

fd8aa35b354149d3046c2231ef64d4498c6698bf