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

[Jan Šafránek]

commit 7fee5324018ae4b2d9d4cd0345f217b29ebf1594
Merge: dc9d370 191307d
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Wed Aug 8 08:58:25 2012 +0200

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

 OpenIPMI.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc OpenIPMI.spec
index f85eebe,9b84d6a..051a456
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@@ -177,9 -177,12 +177,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
 +* Wed Aug  8 2012 Jan Safranek <jsafrane at redhat.com> - 2.0.19-1
 +- Update to 2.0.19
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.18-16
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 2.0.18-15
+ - Perl 5.16 rebuild
+ 
  * Mon May  7 2012 Jan Safranek <jsafrane at redhat.com> - 2.0.18-14
  - Added ipmi systemd unit