4eef7d8 Merge branch 'master' of ssh://pkgs.fedoraproject.org/polipo

Merged and Committed by Bernard Johnson 12 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/polipo
    
    Conflicts:
    	polipo.spec
    
        
file modified
+5 -2