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

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

5ae8e44022811f0f40422bc874af60cffce16e1f