7fee532 Merge branch 'master' of ssh://pkgs.fedoraproject.org/OpenIPMI

Merged and Committed by jsafrane 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/OpenIPMI
    
    Conflicts:
    	OpenIPMI.spec
    
        
file modified
+6 -0