Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 12 Jul 2016 14:04:34 +0000 (16:04 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 12 Jul 2016 14:04:34 +0000 (16:04 +0200)
commita4e6a4d598877aeb055874a82da04f627aa1e64a
treeb3e01471c5d524243934390a0432d86aaca11abc
parent367d3705af06bd57ad0662822c32f86640d7bb62
parentb7c079b643585f21257ef3dea70abb47c9fc3ee2
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/configuration-store-impl/src/StateStorageManagerImpl.kt
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
platform/util/resources/misc/registry.properties