Evgeny Pasynkov 3ca00eb8c8 Merge branch 'master' into upsource-master ...

Conflicts:
	platform/core-impl/src/com/intellij/psi/stubs/StubTree.java
	platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
	platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java

2012-06-06 12:20:51 +02:00

..

src/com/intellij/psi/impl

…

java-indexing-impl.iml

…