Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 7 Oct 2010 16:55:52 +0000 (20:55 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 7 Oct 2010 16:55:52 +0000 (20:55 +0400)
commitf9f32e70dd6f1a794d77f1b4548be1bc4a150acc
tree634f0d59361136ea2fd317b063b1b66403242933
parent62b3f7dcd13d3b281bd3290597887905dc1ac2b3
parent74a76d30650acffd9e35cc5a2d0c25f1a3c8dec2
Merge branch 'master' of git.labs.intellij.net:idea/community