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

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

b7bfd119a020d2d019433a84a0547368f3c4a020