Merge branch 'master' of git@git.labs.intellij.net:idea/community
commitdfacd997ba6d1a2939b7c0fdd59bf37f22af151d
authorDmitry Jemerov <yole@jetbrains.com>
Wed, 10 Feb 2010 15:05:41 +0000 (10 18:05 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Wed, 10 Feb 2010 15:05:41 +0000 (10 18:05 +0300)
treefad605eeb1094bab0515a4f48060d4d1249ade4f
parent3d146c64d9626508557608cdb7259c997718b0fb
parent47344f344107ad4740d04138939e205db8ba41ce
Merge branch 'master' of git@git.labs.intellij.net:idea/community