Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 Jan 2011 17:04:34 +0000 (20:04 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 Jan 2011 17:04:34 +0000 (20:04 +0300)
commitee50e9883d61beca2a4d9437f9e7b418b4c0a19e
tree217d2c51c37124a7adca21a3dc173cb301035033
parent5e042a1a899e3a887a8581cc976cb4b78ec1bcf2
parenta528c6b48b872d689c9778362acd0a1a1daae58c
Merge branch 'master' of git.labs.intellij.net:idea/community