From: Daid <daid303@gmail.com>
Date: Thu, 29 Mar 2012 19:11:43 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC1~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c44c6562357c699342e69c31a116f5948f19bdb2;p=cura.git

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

c44c6562357c699342e69c31a116f5948f19bdb2