Merge branch 'master' into lj/refs

* master: (99 commits)
lock_ref_sha1_basic does not remove empty directories on BSD
git-push: .git/remotes/ file does not require SP after colon
git-mv: invalidate the removed path properly in cache-tree
Makefile: install and clean merge-recur, still.
GIT 1.4.3-rc1
gitweb: tree view: hash_base and hash are now context sensitive
git-diff -B output fix.
fetch: Reset remote refs list each time fetch_main is called
Remove -fPIC which was only needed for Git.xs
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
git-diff -B output fix.
Make cvsexportcommit remove files.
diff --stat: ensure at least one '-' for deletions, and one '+' for additions
diff --stat=width[,name-width]: allow custom diffstat output width.
gitweb: History: blob and tree are first, then commitdiff, etc
gitweb: Remove redundant "commit" from history
http/ftp: optionally ask curl to not use EPSV command
gitweb: Don't use quotemeta on internally generated strings
gitweb: Add snapshot to shortlog
gitweb: Factor out gitweb_have_snapshot()
...

diff --cc Makefile
index 65fb8284f3c9ef210c08711b5ce4796593e72e75,401b893bfaa6a5909b1f8e044401cf4b40002b5b..e826247ccaa5ce2412f3cc10e2e46f7454ae8523
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -300,12 -306,10 +307,12 @@@ BUILTIN_OBJS = 
        builtin-update-ref.o \
        builtin-upload-archive.o \
        builtin-verify-pack.o \
 -      builtin-write-tree.o
 +      builtin-write-tree.o \
 +      builtin-show-ref.o \
 +      builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
- LIBS = $(GITLIBS) -lz
+ EXTLIBS = -lz
  
  #
  # Platform specific tweaks

diff --cc builtin-push.c
Simple merge

diff --cc refs.c
Simple merge