Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 30 Jun 2010 14:44:12 +0000 (18:44 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 30 Jun 2010 14:44:12 +0000 (18:44 +0400)
commitc7ebb81d0005a9bcb30e8e21ca99f8b025e524af
treed61b572551e0dd84a4f146e640d1b4176096f706
parent35c758f4214179b23916ba17b3bf8a8b8ab2eb2e
parent8d4348c815d9e0fa1074b31cb2263fd790738e73
Merge branch 'master' of git.labs.intellij.net:idea/community