From: Daid <daid303@gmail.com>
Date: Wed, 28 Mar 2012 18:36:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:daid/Cura
X-Git-Tag: RC1~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3ec6fa40d6352850096786c02ea07417327f3fb0;p=cura.git

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

3ec6fa40d6352850096786c02ea07417327f3fb0