Merge remote-tracking branch 'origin/master' into amakeev/attach-tests
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 24 Dec 2015 16:43:20 +0000 (17:43 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 24 Dec 2015 16:43:20 +0000 (17:43 +0100)
commitf7d314a190f7b1ba1576e2dbd93e90750cc6af7e
tree1d26ff0001c34e6394da00fdd023f057d2098bfc
parent1337c15d1d5d31e8cf0e3416d1af67abe79b129f
parent36edaad271d9486a7699a0dcef864b65bf54acef
Merge remote-tracking branch 'origin/master' into amakeev/attach-tests