38d1994 Merge branch 'master' into el6/master

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