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

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

a4ba5afb67ab65c4a9383bad2bac789df069a337