Merge branch 'master' of git@git.labs.intellij.net:idea/community into tool-window
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 11:08:20 +0000 (14:08 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jan 2010 11:08:20 +0000 (14:08 +0300)

Trivial merge