Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Fri, 5 Feb 2010 13:49:13 +0000 (16:49 +0300)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Fri, 5 Feb 2010 13:49:13 +0000 (16:49 +0300)
commita38ae136fb84d7303405ce00d06af88c98cfd9af
tree02f9af640c0fb56d5c0ddcf1b3d7829ca4d5cd8f
parentae1f60fad85201f6f1d1d4246b7e2a91db20ddf0
parent1f2b358a6ed46e665889af3f5fccac0fb61f7684
Merge branch 'master' of git.labs.intellij.net:idea/community