From: daid303 <daid303@gmail.com>
Date: Tue, 22 Jan 2013 14:26:01 +0000 (+0100)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: 13.03~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2b61696aa4d0b61221e00bd5f9497291ed7ead2a;p=cura.git

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

2b61696aa4d0b61221e00bd5f9497291ed7ead2a