dacf5a7 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/nsd into el6

Merged and Committed by Paul Wouters 8 years ago
1 file changed. 3 lines added. 2 lines removed.
    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/nsd into el6
    
    Conflicts:
    	nsd.init
    	nsd.spec
    
        
file modified
+3 -2