From 3a27ad03e3c46674560ba663893625ae2e18ab63 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Sep 30 2010 11:44:34 +0000
Subject: Merge remote branch 'origin/master' into f14


Conflicts:
	git.spec

Signed-off-by: Adam Tkac <atkac@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 119e105..c15bf68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.tar.bz2
 /.build*.log
 /git-*/
+/git-1.7.3.1.tar.bz2
diff --git a/git.spec b/git.spec
index 761e440..aa328a9 100644
--- a/git.spec
+++ b/git.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           git
-Version:        1.7.3
-Release:        2%{?dist}.1
+Version:        1.7.3.1
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -454,6 +454,9 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Thu Sep 30 2010 Adam Tkac <atkac redhat com> - 1.7.3.1-1
+- update to 1.7.3.1
+
 * Wed Sep 29 2010 jkeating - 1.7.3-2.1
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 769cf95..73bb43e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d88c06f6442156686deb4b4fbab0954c  git-1.7.2.3.tar.bz2
-c18eb252ce63a688071f10c3f7bc28e1  git-1.7.3.tar.bz2
+77e1611498919965fb65fd1f229ee155  git-1.7.3.1.tar.bz2