Merge changes in the master branch into 0.99.5 preparation branch.

diff --cc Makefile
Simple merge

diff --cc debian/changelog
index dd86f82d8b3fba7974b7d6276a843b8afa31861e,85d4d0094f01b9849de562c35ae54e1be7c870f1..28cfb0f84fb497596e27a554a5b166a301104f70
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +git-core (0.99.5-0) unstable; urgency=low
 +
 +  * GIT 0.99.5
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 10 Aug 2005 22:05:00 -0700
 +
+ git-core (0.99.4-3) unstable; urgency=low
+ 
+   * Split off gitk.
+   * Do not depend on diff which is an essential package.
+   * Use dh_movefiles, not dh_install, to stage two subpackages.
+ 
+  -- Matthias Urlichs <smurf@debian.org>  Thu, 11 Aug 2005 01:43:24 +0200
+ 
  git-core (0.99.4-2) unstable; urgency=low
  
    * Git 0.99.4 official release.