From: daid <daid303@gmail.com>
Date: Thu, 26 Jul 2012 15:29:49 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 12.08~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9a4179e31ddcf9e3d2e91e041b02ccd0dc827d8c;p=cura.git

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

9a4179e31ddcf9e3d2e91e041b02ccd0dc827d8c