Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 6 Jul 2010 11:21:25 +0000 (15:21 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 6 Jul 2010 11:21:25 +0000 (15:21 +0400)
commit26da48e18dc869c2c3069dcf89e4a22cf190e5cc
treea76e6aabc55f7d54b6d3992871282ba6274cd81e
parente1223ec4ccb847eb2fc52eda39648bcab8f74126
parentfd7980e9674bdb6effdac79e494142ba6d9df4cd
Merge branch 'master' of git@git.labs.intellij.net:idea/community