From: daid303 <daid303@gmail.com>
Date: Tue, 12 Mar 2013 09:50:50 +0000 (+0100)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.05~64^2~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=784821e2d409aae944fd5242dff9603b83edc1fc;p=cura.git

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

784821e2d409aae944fd5242dff9603b83edc1fc