4c1f20 Merge branch 'master' of ssh://pkgs.fedoraproject.org/freeipmi

Merged and Committed by aledvink 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/freeipmi
    
    Conflicts:
    	freeipmi.spec
    
        
file modified
+3 -0