From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 26 Jul 2015 20:10:06 +0000 (+0300)
Subject: Merge branch 'dev-7.0.55'
X-Git-Tag: auto/th/tomcat-7.0.63-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftomcat.git;a=commitdiff_plain;h=105a8ca

Merge branch 'dev-7.0.55'

Conflicts:
	tomcat.spec
---

105a8caa39f95da7dac20aedfc97b9ce46223b13