Merge branch 'diff'

author Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>

Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)

committer Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>

Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
author Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
committer Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
diff --cc platform/platform-resources-en/src/misc/registry.properties
Simple merge
author	Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
	Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
committer	Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
	Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)