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

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

9fe24bba87e60129142c93cdbad029bea40ff4e7