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

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

877dc59e4959cda7920f00b20388e47e3468aa8b