From: Ilya Kulakov <kulakov.ilya@gmail.com>
Date: Thu, 7 Mar 2013 04:20:47 +0000 (+0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 13.05~64^2~34^2^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a58d9267fbb966ec2060947da1c753673656d12;p=cura.git

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

6a58d9267fbb966ec2060947da1c753673656d12