From: smorloc <smorloc@gmail.com>
Date: Tue, 22 Jan 2013 18:59:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 13.03~64^2~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a52e6f424428f0c8583b3371b8a29c17f3d4b4c4;p=cura.git

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

a52e6f424428f0c8583b3371b8a29c17f3d4b4c4