3c5d08f Merge branch 'master' into el6

Merged and Committed by Jan ONDREJ (SAL) 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	pnp4nagios.spec
    
        
file modified
+22 -10