From: Daid <daid303@gmail.com>
Date: Tue, 1 May 2012 16:40:18 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~13^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b9d4c9b5fadb4b8d2c10cd83e5cbc5dc3005efb1;p=cura.git

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

b9d4c9b5fadb4b8d2c10cd83e5cbc5dc3005efb1