From: daid303 <daid303@gmail.com>
Date: Wed, 3 Apr 2013 11:24:35 +0000 (+0200)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~133
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=89930496726eff93035690c79776666aef17321e;p=cura.git

Merge branch 'master' into SteamEngine

Conflicts:
	Cura/gui/projectPlanner.py
---

89930496726eff93035690c79776666aef17321e