From: daid <daid303@gmail.com>
Date: Fri, 31 Oct 2014 14:28:14 +0000 (+0100)
Subject: Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
X-Git-Tag: 14.10-RC6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cde393490ba6a0f5e709cfafc584dac01d7a7093;p=cura.git

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

cde393490ba6a0f5e709cfafc584dac01d7a7093