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

Merge branch 'master' into dev

Conflicts:
	README.rst
---

eccd73ad436751601b2968236cde99b2157aaedb