From: daid <daid303@gmail.com>
Date: Tue, 9 Dec 2014 09:35:18 +0000 (+0100)
Subject: Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
X-Git-Tag: 14.12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=af833610f878f71c7b0a36b34febfc70ae82ed46;p=cura.git

Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
---

af833610f878f71c7b0a36b34febfc70ae82ed46