Merge branch 'master' into amakeev/debugger-children
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Apr 2016 18:13:47 +0000 (20:13 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Apr 2016 18:13:47 +0000 (20:13 +0200)
commita26424019229ae473a9cfd79dc99f6bddb90c40f
tree7354e12ed16dc5b0f8b51a004ef7ab513189b855
parente4fd7ae3019d7119e10697f0c90b6b40e36fb29b
parentbb3ad92c7db92d0f436f33e5785c0b8922917ba5
Merge branch 'master' into amakeev/debugger-children