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

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

2be5c170b52fa5380bd95abf3112875dc5069622