From: daid303 <daid303@gmail.com>
Date: Wed, 3 Apr 2013 09:39:01 +0000 (+0200)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~134
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1a3e2b6bcca7c1a178fc6b45ba8bf1cba576627d;p=cura.git

Merge branch 'master' into SteamEngine
---

1a3e2b6bcca7c1a178fc6b45ba8bf1cba576627d