From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 14 May 2014 22:36:09 +0000 (+0200)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~26
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e3309cdd285cc1adb8a4b0fe0db81ee835bb32c6;p=timeside.git

Merge branch 'dev' into server

Conflicts:
	timeside/__init__.py
---

e3309cdd285cc1adb8a4b0fe0db81ee835bb32c6