Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 23 Nov 2010 10:00:26 +0000 (13:00 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 23 Nov 2010 10:00:26 +0000 (13:00 +0300)
commit5fcec010518bb3b277b572e12cd7556562f7292c
treefece2382119ecf8c119efbc202d48ea56faefb5a
parentc4154acd1cc1cb1b27c5b38dbd8b7b2174a9f735
parent3b646d86e8efd878d7e6cdebdae5ecfd5a43f0dc
Merge branch 'master' of git.labs.intellij.net:idea/community