Merge branch 'master' of git.labs.intellij.net:idea/community cidr/98.499 idea/98.500 rubymine/98.501
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Dec 2010 20:10:35 +0000 (23:10 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Dec 2010 20:10:35 +0000 (23:10 +0300)
commit5f0d1eed6bfadfb926201bba56e49bbe41283cd3
tree149b4f14d009f58bf851ec14558af17a46bc73ac
parentbfd4f77c949acb637d4d3fe8dc83fb280ad7f792
parent37ce96f90393887415ca72b22e507c2864dcc19b
Merge branch 'master' of git.labs.intellij.net:idea/community