Merge branch 'master' of git.labs.intellij.net:idea/community
commit84ac0597949cd707aaf933299d7944054d51e534
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 8 Feb 2010 12:27:18 +0000 (8 15:27 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 8 Feb 2010 12:27:18 +0000 (8 15:27 +0300)
tree8ce567ee49ade5739358ee96d42706687c9dd2ae
parentedb4733a8132b9d6b771cdcbfc906e5d2ee4cc9e
parentbdfdcc0a7ac131708193be1fe748df013d85adbb
Merge branch 'master' of git.labs.intellij.net:idea/community