From: Steven Abadie <sabadie31@gmail.com>
Date: Sun, 21 Sep 2014 14:33:50 +0000 (-0600)
Subject: Merge pull request #1 from daid/SteamEngine
X-Git-Tag: 14.10-RC5~38^2^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=816dbc9773f969f495d42eb53956a04079dba801;p=cura.git

Merge pull request #1 from daid/SteamEngine

Merge changes from Cura base
---

816dbc9773f969f495d42eb53956a04079dba801