From: daid303 <daid303@gmail.com>
Date: Mon, 7 Jan 2013 08:44:15 +0000 (+0100)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.03~126
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=42fa12f6c1e3e8327561cc824a7679ccce6df932;p=cura.git

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

42fa12f6c1e3e8327561cc824a7679ccce6df932