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

Merged and Committed by trondham 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/nagios-plugins-openmanage
    
    Conflicts:
    	nagios-plugins-openmanage.spec