e0de6f6 Merge branch 'master' of ssh://pkgs.fedoraproject.org/fence-agents

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