From: daid <daid303@gmail.com>
Date: Fri, 11 May 2012 10:24:27 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=414f7c0c49080904f410db5ed0e020e2e7ed5416;p=cura.git

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

414f7c0c49080904f410db5ed0e020e2e7ed5416