7ed7272 Merge branch 'master' of ssh://pkgs.fedoraproject.org/3proxy

Merged and Committed by hubbitus 10 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/3proxy
    
    Conflicts:
    	3proxy.spec
    
        
file modified
+5 -2