Merge remote-tracking branch 'origin/master'

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

Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)

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

Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)
author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)
committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)
diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
Simple merge
diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
Simple merge
author	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)
committer	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Mon, 8 Dec 2014 16:54:47 +0000 (19:54 +0300)
		1	2
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java	patch \|	diff1 \|	diff2 \|	blob \| history