From: daid <daid303@gmail.com>
Date: Fri, 13 Apr 2012 16:14:50 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~75
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=507c932207dcc02c767df0198a8754e6003be066;p=cura.git

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

507c932207dcc02c767df0198a8754e6003be066