Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 14:50:31 +0000 (17:50 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 14:50:31 +0000 (17:50 +0300)
commit14186dd2c14a83125f98395a0af65ca7fdfc6918
tree031e41824029859a3f5b817b6cccf3a357a5496b
parent325e8894dfa0cecce4dd569a829d0d5e7cd70411
parent55b9c7d053b6ccfd33eda24598d8d34a79ef5d80
Merge branch 'master' of git.labs.intellij.net:idea/community