From: Daid <daid303@gmail.com>
Date: Mon, 4 Jun 2012 13:06:54 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 12.07~44
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=75d4104bc30fa11d505ae15d23e3c05534add806;p=cura.git

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

75d4104bc30fa11d505ae15d23e3c05534add806