From: Daid <daid303@gmail.com>
Date: Thu, 21 Jun 2012 13:03:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 12.07~36^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7a3137e1c77e87ef33103cd601c095ee269fdabe;p=cura.git

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

7a3137e1c77e87ef33103cd601c095ee269fdabe