From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Jul 2014 10:05:53 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4c7c42cb684d2992790391425b9a51f225582c50;p=timeside-diadems.git

Merge branch 'master' into dev

Conflicts:
	README.rst
	setup.py
	timeside/__init__.py
---

4c7c42cb684d2992790391425b9a51f225582c50