Merge branch 'master' of git.labs.intellij.net:idea/community
commitb480bd4664384382e3b26f2da099beec305fce83
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 13:26:13 +0000 (12 16:26 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 13:26:13 +0000 (12 16:26 +0300)
treed1f6fe7b3b904ebd5a9da55a4983c8eafcf933de
parentdb4875863c8996bf64f781ac578e7a4cab314139
parent1a088572fab05faf2c135c4f5e5dd7aecaaa1e91
Merge branch 'master' of git.labs.intellij.net:idea/community