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)
commit207cc207a42c78ef9a8bc4c7a364f8900968c037
tree68e29f8adff35f22879b53b6907accc1ca36e001
parente42ea7a9bd1bcf1aed28ccf78bb69268f309bbee
parent0b4341b2eeb8ba62d3f19c8785001d6159992b71
Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java