[nagios-plugins-openmanage: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/nagios-plugins-openmanage

[Trond Hasle Amundsen]

commit 1f91230bafc9ee7e0853469e64360c3f9f85caef
Merge: 5361c85 975ab61
Author: Trond Hasle Amundsen <t.h.amundsen at usit.uio.no>
Date:   Tue Aug 6 16:05:50 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/nagios-plugins-openmanage
    
    Conflicts:
    	nagios-plugins-openmanage.spec

 nagios-plugins-openmanage.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc nagios-plugins-openmanage.spec
index f93811c,75b5dc3..123ff9a
--- a/nagios-plugins-openmanage.spec
+++ b/nagios-plugins-openmanage.spec
@@@ -71,9 -71,9 +71,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Tue Aug  6 2013 Trond Hasle Amundsen <t.h.amundsen at usit.uio.no> - 3.7.11-1
 +- Upstream release 3.7.11
 +
+ * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 3.7.10-2
+ - Perl 5.18 rebuild
+ 
  * Fri Jul 19 2013 Trond Hasle Amundsen <t.h.amundsen at usit.uio.no> - 3.7.10-1
  - Upstream release 3.7.10