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

Merge branch 'master' into SteamEngine

Conflicts:
	Cura/util/profile.py
---

27f2ba99ef5f044e02c4c682adf9b2512f4fd63a