From fbdd2c234d50660025d1f428a29ec0ce303843a8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Feb 10 2011 16:04:06 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index 4baa2dc..044d2fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ patchutils-0.2.30.tar.bz2
 patchutils-0.2.31.tar.bz2
 patchutils-0.3.0.tar.bz2
 patchutils-0.3.1.tar.bz2
+/patchutils-0.3.2.tar.bz2
diff --git a/patchutils-0.3.1.tar.bz2.sig b/patchutils-0.3.1.tar.bz2.sig
deleted file mode 100644
index 29f1ee9..0000000
Binary files a/patchutils-0.3.1.tar.bz2.sig and /dev/null differ
diff --git a/patchutils-0.3.2.tar.bz2.sig b/patchutils-0.3.2.tar.bz2.sig
new file mode 100644
index 0000000..b07bb47
Binary files /dev/null and b/patchutils-0.3.2.tar.bz2.sig differ
diff --git a/patchutils.spec b/patchutils.spec
index 7361c1c..663a1a8 100644
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -1,7 +1,7 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
-Version: 0.3.1
-Release: 3%{?dist}
+Version: 0.3.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
@@ -45,6 +45,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Thu Feb 10 2011 Tim Waugh <twaugh@redhat.com> 0.3.2-1
+- 0.3.2.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index fe1e676..097ff73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fd9bca58a429fbbb1c2126f1b72aa23  patchutils-0.3.1.tar.bz2
+74607b4a28c9009c6aeeed0e91098917  patchutils-0.3.2.tar.bz2