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

Merge branch 'dev'

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

a861b4b1f0ccaa0a81e5f67a00962bc57515f3f5