Merge master changes into rc.

diff --combined Makefile
index ff3d7e3fadd5b0eb8e41e59462e0542f1e162ee1,16ab0c7f026f3e94bd2c4d1ef1600bcc9ab4e837..1623247273d2ec13e65fc74ecfca49b7e578ff2e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.4
 +GIT_VERSION = 0.99.5
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -71,6 -71,7 +71,7 @@@ SCRIPTS=git git-apply-patch-script git-
  SCRIPTS += git-count-objects-script
  # SCRIPTS += git-send-email-script
  SCRIPTS += git-revert-script
+ SCRIPTS += git-show-branches-script
  
  PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \