b78a6ae Merge branch 'master' of ssh://pkgs.fedoraproject.org/bitlbee

Merged and Committed by mcepl 13 years ago
1 file changed. 8 lines added. 1 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bitlbee
    
    Conflicts:
    	bitlbee.spec
    
        
file modified
+8 -1