From: Junio C Hamano <junkio@cox.net>
Date: Mon, 5 Sep 2005 08:42:11 +0000 (-0700)
Subject: Merge branch 'master' of .
X-Git-Tag: v0.99.6^2~1
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/712d865523cbfd3025e555398b8caa164466529d?hp=0516de30e8bdd26086e2a3edd3375981fd0c34d6

Merge branch 'master' of .
---

diff --git a/Makefile b/Makefile
index 9aa0c9a4f1..033c96e8f1 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.5
+GIT_VERSION = 0.99.6
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)
diff --git a/debian/changelog b/debian/changelog
index 5b7b4d3ff3..f3cf358fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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