From: daid <daid303@gmail.com>
Date: Fri, 11 May 2012 11:41:26 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a6dcb8fc4c40a5294cb7966b636ceb5221517c5e;p=cura.git

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

a6dcb8fc4c40a5294cb7966b636ceb5221517c5e