Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 16 Jul 2010 09:05:10 +0000 (13:05 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 16 Jul 2010 09:05:10 +0000 (13:05 +0400)

Trivial merge