Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 16:22:21 +0000 (19:22 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 16:22:21 +0000 (19:22 +0300)
commit4316a57a09693a49a706b18e9bec12eb724eb9be
tree9bdaeb0adbabe57ff58b068570644dc38f4de54d
parent72b22472575623c86a82a06dbe8003aa875ae599
parent9aa9935bf88c6a26daa2442ce0e09b2ff6602dd9
Merge branch 'master' of git.labs.intellij.net:idea/community