From e0de6f635281062f664dcb31a879367178b661a0 Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Jul 01 2014 12:51:05 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents


Conflicts:
	fence-agents.spec

---

diff --git a/fence-agents.spec b/fence-agents.spec
index 227eee9..4829832 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -609,6 +609,9 @@ The fence-agents-wti package contains a fence agent for WTI network power switch
 %{_mandir}/man8/fence_wti.8*
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri May 16 2014 Marek Grac <mgrac@redhat.com> - 4.0.9
 - new upstream release
 - new package fence-agents-pve