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

[aledvink]

commit 4c1f20221324815d81d0aee4052ecaad479f6982
Merge: b38868a afc8920
Author: aledvink <aledvink at host.al>
Date:   Thu Jul 3 17:56:18 2014 +0200

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

 freeipmi.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc freeipmi.spec
index 2ef95c7,eb40e7c..eeb6a12
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@@ -348,10 -348,9 +348,13 @@@ f
  %dir %{_localstatedir}/cache/ipmiseld
  
  %changelog
 +* Thu Jul 03 2014 Ales Ledvinka <aledvink at redhat.com> - 1.4.4-1
 +- 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 at lists.fedoraproject.org> - 1.4.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri May 16 2014 Ales Ledvinka <aledvink at redhat.com> - 1.4.3-1
  - Updated to upstream freeipmi-1.4.3
   - In ipmi-oem, support Supermicro get-power-supply-status and