From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 10 Nov 2013 08:16:34 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 0.5.1-2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=301b8a7d920e3e984e2d85b450d21deb801fd538;p=timeside.git

Merge branch 'dev'

Conflicts:
	doc/source/news.rst
---

301b8a7d920e3e984e2d85b450d21deb801fd538