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

[Jan Šafránek]

commit d903623cc55cd49298dbaa31d8358468162edd7f
Merge: f8cd919 62c182a
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Tue Jul 31 10:13:12 2012 +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 7522f1d,b5c5a58..ab1feb0
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@@ -359,12 -359,9 +359,15 @@@ f
  %{_unitdir}/ipmidetectd.service
  
  %changelog
 +* Tue Jul 31 2012 Jan Safranek <jsafrane at redhat.com> - 1.1.7-1
 +- Updated to freeipmi-1.1.7:
 +  - In ipmi-sensors and ipmi-sel, fix units output corner case.
 +  - In bmc-info, detect unsupported system info corner case.
 +  - Update documentation with motherboard support.
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jul 17 2012 Jan Safranek <jsafrane at redhat.com> - 1.1.6-3
  - fixed License to GPLv3+