From: Daid <daid303@gmail.com>
Date: Wed, 9 May 2012 20:12:02 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5c7c2c20da3c42b2c9865e1fbc1e82c34eb89088;p=cura.git

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

5c7c2c20da3c42b2c9865e1fbc1e82c34eb89088