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

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

102c7e35f99a0083d49079a4291cb096ee012174