040da49 Merge branch 'master' of ssh://pkgs.fedoraproject.org/jetty

Merged and Committed by akurtakov 11 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/jetty
    
    Conflicts:
    	jetty.spec
    
        
file modified
+3 -0