Merge remote-tracking branch 'origin/master' into amakeev/debugger clion/162.692
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 1 Jun 2016 13:16:42 +0000 (15:16 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 1 Jun 2016 13:16:42 +0000 (15:16 +0200)
commit153b722ad77cbe141865968cab77a0c6f8bd6025
treeb1c0e1d43613c4001d5e475cb7a41e25d6119447
parente65af95b09dc91dffbd5b264ca2d9c4860c649bf
parent1a62bdc946b111ac204f4ebd68f38954ef956c3a
Merge remote-tracking branch 'origin/master' into amakeev/debugger

# Conflicts:
# platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java