Merge master changes into release candidate branch.

diff --git a/debian/changelog b/debian/changelog
index 28cfb0f84fb497596e27a554a5b166a301104f70..da7526e2cbaf6cf737515032b916d5e2e54d677e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ git-core (0.99.5-0) unstable; urgency=low
 
  -- Junio C Hamano <junkio@cox.net>  Wed, 10 Aug 2005 22:05:00 -0700
 
+git-core (0.99.4-4) unstable; urgency=low
+
+  * Mark git-tk as architecture neutral.
+
+ -- Junio C Hamano <junkio@cox.net>  Fri, 12 Aug 2005 13:25:00 -0700
+
 git-core (0.99.4-3) unstable; urgency=low
 
   * Split off gitk.