From: daid303 <daid303@gmail.com>
Date: Tue, 2 Oct 2012 09:01:05 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.03~301
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=204063e20dd34bbff96628ea48134d480751596b;p=cura.git

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

204063e20dd34bbff96628ea48134d480751596b