From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 17 Oct 2013 01:03:01 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d9f5565aa7c58180b79c14d70594d4f02d2a178d;p=timeside-diadems.git

Merge branch 'master' into dev

Conflicts:
	README.rst
---

d9f5565aa7c58180b79c14d70594d4f02d2a178d