From a0155ccc3f6a7901f34f578cb1052f2f56ab79bc Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Aug 06 2013 14:35:32 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/sendmail


Conflicts:
	sendmail.spec

---

diff --git a/sendmail.spec b/sendmail.spec
index 6d55041..acb8df1 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -23,7 +23,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -706,10 +706,13 @@ fi
 %{_initrddir}/sendmail
 
 %changelog
-* Tue Aug  6 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.7-4
+* Tue Aug  6 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.7-5
 - Used unversioned doc directory
   Resolves: rhbz#994090
 
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 8.14.7-4
+- Perl 5.18 rebuild
+
 * Fri Aug  2 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.7-3
 - Rebuilt with -D_FILE_OFFSET_BITS=64
   Related: rhbz#912785