Merge branch 'svn_18_3'

author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>

Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)

committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>

Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
diff --cc platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
Simple merge
diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
Simple merge
diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
Simple merge
author	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
committer	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
		1	2
platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java	patch \|	diff1 \|	diff2 \|	blob \| history