From: Ferdi van der Werf <efcm@vdwerf.eu>
Date: Mon, 23 Apr 2012 10:52:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: RC3~18^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3a9efc3de188c0615083b900f3d0b42a538ea74d;p=cura.git

Merge remote-tracking branch 'upstream/master'
---

3a9efc3de188c0615083b900f3d0b42a538ea74d