From: Daid <daid303@gmail.com>
Date: Tue, 25 Sep 2012 10:09:09 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.03~329
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=183304d975fc4b45cabbea373a7bcb7c878c6e15;p=cura.git

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

Conflicts:
	Cura/util/machineCom.py
---

183304d975fc4b45cabbea373a7bcb7c878c6e15