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

Merge branch 'dev'

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

6259aef70bef047d531865cf5843af1db9fdb39a