From: Daid <daid303@gmail.com>
Date: Fri, 30 Mar 2012 15:39:18 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC1~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fe91a1b1232f2fdfe0c09ad92884259933cf6aa6;p=cura.git

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

fe91a1b1232f2fdfe0c09ad92884259933cf6aa6