Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 13 Nov 2009 17:17:33 +0000 (20:17 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 13 Nov 2009 17:17:33 +0000 (20:17 +0300)

Trivial merge