[sendmail: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/sendmail

[Jaroslav Škarvada]

commit a0155ccc3f6a7901f34f578cb1052f2f56ab79bc
Merge: ea71ef9 61569f3
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Aug 6 16:35:32 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/sendmail
    
    Conflicts:
    	sendmail.spec

 sendmail.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc sendmail.spec
index 6d55041,a17abc1..acb8df1
--- a/sendmail.spec
+++ b/sendmail.spec
@@@ -23,7 -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,9 +706,13 @@@ f
  %{_initrddir}/sendmail
  
  %changelog
- * Tue Aug  6 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.7-4
++* Tue Aug  6 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.7-5
 +- Used unversioned doc directory
 +  Resolves: rhbz#994090
 +
+ * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 8.14.7-4
+ - Perl 5.18 rebuild
+ 
  * Fri Aug  2 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.7-3
  - Rebuilt with -D_FILE_OFFSET_BITS=64
    Related: rhbz#912785