Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 May 2010 15:47:41 +0000 (19:47 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 May 2010 15:47:41 +0000 (19:47 +0400)
commit45859a2bacb8602fd0e234d442b25e7ce0125963
treeb3ffc6c8ac52ea2287bf3c16cf6dbc4ca8cfd2f5
parentb96ecd8a23b32897d2a57cc5b32d6561fb183f45
parent613619b762e35293bf90ad3057b4f05cc3af4296
Merge branch 'master' of git.labs.intellij.net:idea/community