Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 22 Jun 2010 09:37:41 +0000 (13:37 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 22 Jun 2010 09:37:41 +0000 (13:37 +0400)
commit2ad6fd44d4523007fb758d0fb1038332a0a28994
tree96443887114ae8c72c608e2f39f2656731c53d6b
parenta5804fc57bbc4f769f8e97a64ea11e52e972ff24
parent4155fa12902d70700c37c55eba2f9c23b0d92ab4
Merge branch 'master' of git.labs.intellij.net:idea/community