From: daid303 <daid303@gmail.com>
Date: Wed, 3 Oct 2012 13:13:38 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.03~296
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ddf6222dc9148e6527f90bd0a71b651b5d5b3f39;p=cura.git

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

ddf6222dc9148e6527f90bd0a71b651b5d5b3f39