Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Gopachenko <alexey.gopachenko@jetbrains.com>
Mon, 15 Feb 2010 12:42:05 +0000 (15 15:42 +0300)
committerAlexey Gopachenko <alexey.gopachenko@jetbrains.com>
Mon, 15 Feb 2010 12:42:05 +0000 (15 15:42 +0300)

Trivial merge