de16bd1 Merge branch 'master' of ssh://pkgs.fedoraproject.org/nsd

Merged and Committed by pwouters 8 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/nsd
    
    Conflicts:
    	nsd.spec
    
        
file modified
+1 -0
file removed
-140
file modified
+2 -5
file modified
+1 -1