223bf41 Merge branch 'master' of ssh://pkgs.fedoraproject.org/pnp4nagios

Merged and Committed by Jan ONDREJ (SAL) 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pnp4nagios
    
    Conflicts:
    	pnp4nagios.spec
    
        
file modified
+8 -2