From e7f8fe684f36cf2b6c48fd01d38898f47d01af4e Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Oct 08 2011 21:55:37 +0000
Subject: Merge remote branch 'origin/master' into el6


---

diff --git a/.gitignore b/.gitignore
index 3db8a28..d96ea66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Convert-UUlib-1.34.tar.gz
+Convert-UUlib-1.4.tar.gz
diff --git a/perl-Convert-UUlib.spec b/perl-Convert-UUlib.spec
index 11793a3..f7d5c1f 100644
--- a/perl-Convert-UUlib.spec
+++ b/perl-Convert-UUlib.spec
@@ -5,8 +5,8 @@
 
 Summary:	Perl interface to the uulib library
 Name:		perl-Convert-UUlib
-Epoch:		1
-Version:	1.34
+Epoch:		2
+Version:	1.4
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -47,6 +47,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/Convert::UUlib*
 
 %changelog
+* Sat Oct 08 2011 Robert Scheck <robert@fedoraproject.org> 2:1.4-1
+- Upgrade to 1.4
+
+* Wed Jun 15 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:1.34-3
+- Perl mass rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Dec 28 2010 Robert Scheck <robert@fedoraproject.org> 1:1.34-1
 - Upgrade to 1.34
 
diff --git a/sources b/sources
index 900123a..e149512 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd4eed0a73093a786f9edcff7fcf854f  Convert-UUlib-1.34.tar.gz
+a6486df1d9ce319406fb9d5a610da759  Convert-UUlib-1.4.tar.gz