From: Daid <daid303@gmail.com>
Date: Fri, 4 May 2012 22:10:37 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1b6cb8913cafeab44fcde0e59b88370dd0eec982;p=cura.git

Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/gui/sliceProgessPanel.py
---

1b6cb8913cafeab44fcde0e59b88370dd0eec982