230ffa4 Merge branch 'master' into el6

Merged and Committed by Jan ONDREJ (SAL) 12 years ago
    Merge branch 'master' into el6
    Updated to 0.6.1.
    Conflicts:
    	pnp4nagios.spec
    
        
file modified
+1 -0
file modified
+34 -20
file modified
+1 -0