Merge branch 'master' of git@git.labs.intellij.net:idea/community
commit85ce7cab1f28f782738e2c8c79fcdda5dc63a828
authornik <Nikolay.Chashnikov@jetbrains.com>
Thu, 26 Nov 2009 06:25:11 +0000 (26 09:25 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Thu, 26 Nov 2009 06:25:11 +0000 (26 09:25 +0300)
tree79fa2a12bf7789868ad783c72aa6931b5fed1287
parenta7faad16c32cbb963f8f5fef589ed6ea4a75db4a
parent25146ca333c8ae1dadeb08b427fe6bf66e980bff
Merge branch 'master' of git@git.labs.intellij.net:idea/community