Merge refs/heads/master from .

diff --combined Makefile
index c0a84298b5a0fde300d18b46bc77d4da8d2e11a4,ac4f2110dcab8a66a4808a92f569b1eaaa10b699..797c27fb04b950275c99a6449527658ccbe33a9b
--- 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,7 -71,6 +71,6 @@@ 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 \
@@@ -84,7 -83,7 +83,7 @@@
        git-diff-stages git-rev-parse git-patch-id git-pack-objects \
        git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
        git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
-       git-show-index git-daemon git-var git-peek-remote \
+       git-show-index git-daemon git-var git-peek-remote git-show-branch \
        git-update-server-info git-show-rev-cache git-build-rev-cache
  
  ifndef NO_CURL