Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 11 Jul 2016 14:13:23 +0000 (16:13 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 11 Jul 2016 14:13:23 +0000 (16:13 +0200)
commit19cfe398d5cd85471d0d6950c4e66c782c3a1c69
treedcb5695fe5466ca5d2ee261f3bc0fea01876277b
parenta6f5ba9d5200375f535867a655d4d4e6946f3a35
parentbf9a1b27aabf3362ffe2912ea04781fb29d16de4
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java
# python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/util/resources/misc/registry.properties
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java