From: daid303 <daid303@gmail.com>
Date: Wed, 17 Apr 2013 14:29:15 +0000 (+0200)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~85
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d7ef250e691993a1c756c4df3a763cf7d6b5a0fa;p=cura.git

Merge branch 'master' into SteamEngine
---

d7ef250e691993a1c756c4df3a763cf7d6b5a0fa