Merge fixes up to GIT 1.0.4

diff --git a/debian/changelog b/debian/changelog
index 8d6c0667c7dc9c8ef92ba494d0ddc625e0f01260..d7f75910798c14e21107c26c97f76292fb3c62a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ git-core (1.0.0.GIT-0) unstable; urgency=low
 
  -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 12:12:05 -0800
 
+git-core (1.0.4-0) unstable; urgency=low
+
+  * GIT 1.0.4.
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 24 Dec 2005 00:01:20 -0800
+
 git-core (1.0.3-0) unstable; urgency=low
 
   * GIT 1.0.3 maintenance release.