From: Ilya Kulakov <kulakov.ilya@gmail.com>
Date: Fri, 7 Dec 2012 07:48:25 +0000 (+0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 13.03~168^2^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=cura.git;a=commitdiff_plain;h=f42ee83bc74883810b310fcce4a336b3e7ff23d9

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

f42ee83bc74883810b310fcce4a336b3e7ff23d9