From 4c1f20221324815d81d0aee4052ecaad479f6982 Mon Sep 17 00:00:00 2001
From: aledvink <aledvink@host.al>
Date: Jul 03 2014 15:56:18 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/freeipmi


Conflicts:
	freeipmi.spec

---

diff --git a/freeipmi.spec b/freeipmi.spec
index 2ef95c7..eeb6a12 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -352,6 +352,9 @@ fi
 - Updated to upstream freeipmi-1.4.4
  - Support retrys of SSIF reads to handle SSIF NACKs.
 
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri May 16 2014 Ales Ledvinka <aledvink@redhat.com> - 1.4.3-1
 - Updated to upstream freeipmi-1.4.3
  - In ipmi-oem, support Supermicro get-power-supply-status and