Merge branch 'master' of git.labs.intellij.net:idea/community
commit83971ad2c38faadc5dfc9081c5f960b28fcf9921
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 15:54:05 +0000 (26 18:54 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 15:54:05 +0000 (26 18:54 +0300)
tree9fe0370c85e7b9da1c45d682b0820859866851c3
parentffb931b90f572ff7809e11d2fb3c700e533519fe
parent68cb2e5e7e98ed59a6b2e229e8e858c803345936
Merge branch 'master' of git.labs.intellij.net:idea/community