7db0115 Merge branch 'master' into el5

Merged and Committed by nb 11 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	znc.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+33 -40