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

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

12e25b5764d85eb1ba1f97fb9fc0d71827d8e35e