From: Ilya Kulakov <kulakov.ilya@gmail.com>
Date: Sat, 9 Mar 2013 08:58:48 +0000 (+0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 13.05~64^2~34^2^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f2af72562a5b598ce79568a4ba4106fe59703c0b;p=cura.git

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

f2af72562a5b598ce79568a4ba4106fe59703c0b