From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 9 Apr 2014 00:02:40 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fed75f11f238f7af6090479c821e0d2944a15289;p=timeside-diadems.git

Merge branch 'dev'

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

fed75f11f238f7af6090479c821e0d2944a15289