[packages/tomcat: 7/7] Merge branch 'dev-7.0.55'

[glen]

commit 105a8caa39f95da7dac20aedfc97b9ce46223b13
Merge: 37e6572 467312f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jul 26 23:10:06 2015 +0300

    Merge branch 'dev-7.0.55'
    
    Conflicts:
    	tomcat.spec

 jcl.patch                         |  16 ++
 server.xml-URIEncoding-utf8.patch |  16 +-
 tomcat-build.xml.patch            | 368 +-------------------------------------
 tomcat.spec                       |  37 ++--
 4 files changed, 55 insertions(+), 382 deletions(-)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/105a8caa39f95da7dac20aedfc97b9ce46223b13