4d49e58 Merge branch 'master' of ssh://pkgs.fedoraproject.org/validns

Merged and Committed by pwouters 11 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/validns
    
    Conflicts:
    	validns.spec
    
        
file modified
+5 -2