From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 18 Dec 2014 10:44:37 +0000 (+0100)
Subject: Merge branch 'diadems' of github.com:Parisson/TimeSide into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdiadems;p=timeside.git

Merge branch 'diadems' of github.com:Parisson/TimeSide into diadems

Conflicts:
	setup.py
	timeside/grapher/render_analyzers.py
---

cd01d3847ddb3b03a5611120b0f4640bfaa4779d