Merge remote-tracking branch 'origin/master'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 9 Jan 2015 12:13:10 +0000 (13:13 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 9 Jan 2015 12:13:10 +0000 (13:13 +0100)
commit8f74efb63b56ec2fc047bbfe853fd7d04b95368d
treee161397e149f1372ce796323af3263328ac70ca1
parentd9a6616eb06dcbd52501366293263d31be24136e
parent5ba904ddf86030af18dfd69e4a31291133e9fe52
Merge remote-tracking branch 'origin/master'