Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 30 Jun 2010 07:23:31 +0000 (11:23 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 30 Jun 2010 07:23:31 +0000 (11:23 +0400)
Conflicts:
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java


Trivial merge