From: Daid <daid303@gmail.com>
Date: Tue, 17 Apr 2012 21:18:58 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~68^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e3aae1e716a4461c38114188f61a08ea960cd25e;p=cura.git

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

e3aae1e716a4461c38114188f61a08ea960cd25e