Merge branch 'master' of git@git.labs.intellij.net:idea/community into tool-window...

author Kirill Kalishev <kirill.kalishev@jetbrains.com>

Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)

committer Kirill Kalishev <kirill.kalishev@jetbrains.com>

Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)
author Kirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)
committer Kirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)
diff --cc platform/platform-resources-en/src/messages/ActionsBundle.properties
Simple merge
author	Kirill Kalishev <kirill.kalishev@jetbrains.com>
	Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)
committer	Kirill Kalishev <kirill.kalishev@jetbrains.com>
	Thu, 29 Oct 2009 07:27:42 +0000 (10:27 +0300)