commit 8e4f3d6b542c7f8eac828e7ef4aad39bd999dddf Merge: 8871cfb fcebce5 Author: Ville Skyttä <ville.skytta at iki.fi> Date: Tue Oct 15 13:13:24 2013 +0300 Merge branch 'el6' into el5 sources | 2 +- tomcat-native.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---