From: Daid <daid303@gmail.com>
Date: Thu, 3 May 2012 17:23:12 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~13^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=06bf4c6f9368a96d8e455b59bc984beab577a4ef;p=cura.git

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

06bf4c6f9368a96d8e455b59bc984beab577a4ef