From: daid <daid303@gmail.com>
Date: Mon, 2 Jul 2012 08:11:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 12.07~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=402c2223ca4d73075562bef30464546b72f2da7b;p=cura.git

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

402c2223ca4d73075562bef30464546b72f2da7b