Merge branch 'master' of git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Tue, 28 Dec 2010 06:15:00 +0000 (09:15 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Tue, 28 Dec 2010 06:15:00 +0000 (09:15 +0300)
commit1858aeb2f5790ba7134d9c5dad2e2225fd8c311c
treef63ff5cea3ab3428ae64e353a6d7df6cdd5a3a15
parentc76f17b0960fc3a37a811939e3b3d33c0dd53338
parent6d27054bab146e2a56517f1727a92376139affc6
Merge branch 'master' of git.labs.intellij.net:idea/community