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

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

84d2b079b27a44acd695b0633068f8a2a1408bb8