bda4144 Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/bitlbee into epel7

Merged and Committed by robert 7 years ago
1 file changed. 3 lines added. 4 lines removed.
    Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/bitlbee into epel7
    
    Conflicts:
    	bitlbee-systemd.patch
    	bitlbee.spec
    
        
file modified
+3 -4