From: daid <daid303@gmail.com>
Date: Tue, 10 Jul 2012 15:04:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 12.08~36
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3ab6f8b645a8a39b34d5ba66e95da64345e2f5bb;p=cura.git

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

3ab6f8b645a8a39b34d5ba66e95da64345e2f5bb