Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 20 Oct 2010 13:27:54 +0000 (17:27 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 20 Oct 2010 13:27:54 +0000 (17:27 +0400)

Trivial merge