a43135a Merge branch 'master' of ssh://pkgs.fedoraproject.org/fping

Merged and Committed by cra 10 years ago
1 file changed. 4 lines added. 1 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fping
    
    Conflicts:
    	fping.spec
    
        
file modified
+4 -1