Merge remote-tracking branch 'origin/master' into develar/is

author Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>

Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)

committer Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>

Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)
author Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)
committer Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)
diff --cc platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java
Simple merge
diff --cc python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
Simple merge
author	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)
committer	Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
	Fri, 24 Jun 2016 09:31:06 +0000 (11:31 +0200)
		1	2
platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java	patch \|	diff1 \|	diff2 \|	blob \| history
python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java	patch \|	diff1 \|	diff2 \|	blob \| history