Merge branch 'master' of git.labs.intellij.net:idea/community rubymine/96.642
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Jul 2010 12:44:31 +0000 (16:44 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Jul 2010 12:44:31 +0000 (16:44 +0400)

Trivial merge