db43712 Merge branch 'master' into f14/master

Merged and Committed by peter 13 years ago
1 file changed. 6 lines added. 3 lines removed.
    Merge branch 'master' into f14/master
    
    Conflicts:
    	nrpe.spec
    
        
file modified
+6 -3