b7e10ec Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19

Merged and Committed by van 11 years ago
    Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19
    
    Conflicts:
    	tomcat.spec
    
        
file modified
+1 -1
file modified
+9 -1