Merge branch 'master' of git.labs.intellij.net:idea/community
commit551609d7c85d766c0c85a8fd774b0db76e353389
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Tue, 12 Jan 2010 12:41:22 +0000 (12 15:41 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Tue, 12 Jan 2010 12:41:22 +0000 (12 15:41 +0300)
treedf1180a78a98f6ba4cd2869bdbf6546aaef95ba8
parentb9589ec47e3740c70a9506a1c1a7992ff04fc24a
parent10e836d7e21ff9695860daa01a24ede3f5d6e343
Merge branch 'master' of git.labs.intellij.net:idea/community