From: Junio C Hamano <junkio@cox.net>
Date: Sat, 27 Aug 2005 05:47:27 +0000 (-0700)
Subject: Merge master branch changes into release candidate branch.
X-Git-Tag: v0.99.6^2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f583175317a1c5c57b56c87856fbe46c3f3c296;p=git.git

Merge master branch changes into release candidate branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

0f583175317a1c5c57b56c87856fbe46c3f3c296
diff --cc debian/changelog
index 0c87797e8,5b7b4d3ff..f3cf358fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +git-core (0.99.6-0) unstable; urgency=low
 +
 +  * GIT 0.99.6
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 24 Aug 2005 23:09:35 -0700
 +
+ git-core (0.99.5-1) unstable; urgency=low
+ 
+   * Enable git-send-email-script on Debian.  There is no reason to shy
+     away from it, since we have the necessary Perl modules available.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Thu, 25 Aug 2005 14:16:59 -0700
+ 
  git-core (0.99.5-0) unstable; urgency=low
  
    * GIT 0.99.5