[fence-agents: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents

[Marek Grác]

commit 50597b9f3acb95e794b0b24df459784a1b6d2d73
Merge: 4d05b95 200e971
Author: Marek 'marx' Grac <mgrac at redhat.com>
Date:   Tue Sep 3 15:50:26 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents
    
    Conflicts:
    	fence-agents.spec

 fence-agents.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc fence-agents.spec
index 07c8f17,b93d785..17a2d0b
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@@ -517,9 -489,11 +517,14 @@@ The fence-agents-wti package contains 
  %{_mandir}/man8/fence_wti.8*
  
  %changelog
 +* Tue Sep 03 2013 Marek Grac <mgrac at redhat.com> - 4.0.3-1
 +- new upstream release
 +- new packages fence-agents-brocade and fence-agents-ovh
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Jul 18 2013 Petr Pisar <ppisar at redhat.com> - 4.0.1-2
+ - Perl 5.18 rebuild
  
  * Mon Jul 01 2013 Marek Grac <mgrac at redhat.com> - 4.0.1-1
  - new upstream release