d0ece1e Merge branch 'master' into el5

Merged and Committed by mcepl 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	bitlbee.spec
    	sources
    
        
file modified
+1 -0
file added
+179
file modified
+16 -17
file modified
+1 -1