Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 12 Jan 2011 12:02:48 +0000 (15:02 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 12 Jan 2011 12:02:48 +0000 (15:02 +0300)
commit7d03ce8e57fa2c582eccc20af420fc24d78ec093
treee1fd8184ed934afa99b263771ad8ef8f227e282b
parent99ac8f8ee10a162d5b5147fd72d961e2df0aa037
parentc95d55e7a17a952d537685b1da8069fccfd80200
Merge branch 'master' of git.labs.intellij.net:idea/community