From: daid <daid303@gmail.com>
Date: Wed, 18 Apr 2012 08:53:59 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC3~67
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00ba00cefa59844a4095ec351b0c7b800fe1c51d;p=cura.git

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

00ba00cefa59844a4095ec351b0c7b800fe1c51d