Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Nov 2010 21:26:52 +0000 (00:26 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Nov 2010 21:26:52 +0000 (00:26 +0300)
commitd3b5514c1c51b9d68eb26910afeaec46853ef7cb
treefb00d61e8830a2aefdc4e513aecab93f83dbb9a6
parentb52bf2eada0664fafcd8858389631c3d2da5cdd1
parent78668ff48ac33e837970dc5ac607d33ce90ea46e
Merge branch 'master' of git.labs.intellij.net:idea/community
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/GitVcs.java
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java