Merge branch 'maint'

* maint:
  GIT 1.6.0.4
  Update RPM spec for the new location of git-cvsserver.
  push: fix local refs update if already up-to-date
  do not force write of packed refs

Conflicts:
	builtin-revert.c

Documentation/RelNotes-1.6.0.4.txt

@@ -16,6 +16,9 @@ Fixes since v1.6.0.3
 * 'git push --mirror' tried and failed to push the stash; there is no
   point in sending it to begin with.
 
+* 'git push' did not update the remote tracking reference if the corresponding
+  ref on the remote end happened to be already up to date.
+
 * 'git pull $there $branch:$current_branch' did not work when you were on
   a branch yet to be born.
 
@@ -29,12 +32,8 @@ Fixes since v1.6.0.3
 
 * 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
 
+* 'git update-ref -d' to remove a reference did not honor --no-deref option.
+
 * Plugged small memleaks here and there.
 
 * Also contains many documentation updates.
-
---
-exec >/var/tmp/1
-O=v1.6.0.3-34-gf6276b7
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint