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

Merge branch 'dev' into server

Conflicts:
	timeside/__init__.py
---

41310a05055488a25f7df58c7389da89f9c0bfa0