From: daid303 <daid303@gmail.com>
Date: Fri, 29 Mar 2013 17:41:09 +0000 (+0100)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6300f6eab82707367c5a90a9c4337eae5dc83486;p=cura.git

Merge branch 'master' into SteamEngine

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

6300f6eab82707367c5a90a9c4337eae5dc83486