9a96ca8 update to upstream

Merged and Committed by Jan ONDREJ (SAL) 11 years ago
    update to upstream
    
    Merge branch 'master' into el6
    
    Conflicts:
    	pnp4nagios.spec
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -0