641bfe1 Merge branch 'master' into epel7

Merged and Committed by mcepl 8 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	bitlbee.spec
    
        
file modified
+13 -7
file modified
+1 -1