Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 8 Jul 2016 08:11:44 +0000 (10:11 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 8 Jul 2016 08:11:44 +0000 (10:11 +0200)
commite16ce9edb4b8b08306d5fff10bd4f34dcd143f0f
treee063c45374a99e0e20c3739bc1e2634bf724a8f6
parent70ccc5dd01871040dc8ae2b2702a19c48ce421fb
parent6d612e35a56a5d2a18fd2941de8d962ba09772f6
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
# platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
java/java-tests/java-tests.iml
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/util/resources/misc/registry.properties
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java