Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 13 Sep 2010 19:34:43 +0000 (23:34 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 13 Sep 2010 19:34:43 +0000 (23:34 +0400)
commitdc8c22c5f7681abb85219d9c9999bf5254c02a54
tree4645c9a5337f09d6f1149002958e79ad43acc5d5
parent354d4bf948e0cd98210879cdaf8f060542fabcd7
parent945255f3a2c4c7924df2298e3990a830e4fd57d8
Merge branch 'master' of git@git.labs.intellij.net:idea/community