Merge branch 'svn1_8_new'

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

Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)

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

Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)
author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)
committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)
diff --cc .idea/modules.xml
Simple merge
diff --cc build/scripts/layouts.gant
Simple merge
diff --cc platform/util/src/com/intellij/openapi/util/text/StringUtil.java
Simple merge
author	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)
committer	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Tue, 27 Aug 2013 09:56:56 +0000 (13:56 +0400)
		1	2
.idea/modules.xml	patch \|	diff1 \|	diff2 \|	blob \| history
build/scripts/layouts.gant	patch \|	diff1 \|	diff2 \|	blob \| history
platform/util/src/com/intellij/openapi/util/text/StringUtil.java	patch \|	diff1 \|	diff2 \|	blob \| history