[tomcat/f19: 3/3] Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19

[Ivan Afonichev]

commit b7e10ec5454db62e0f048f54a981f2ccf382c1cf
Merge: 9b14c45 6df24b6
Author: Ivan Afonichev <ivan.afonichev at gmail.com>
Date:   Sat May 11 19:51:28 2013 +0400

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

 sources     |    2 +-
 tomcat.spec |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc tomcat.spec
index 0b2341c,d1cb027..4f0e810
--- a/tomcat.spec
+++ b/tomcat.spec
@@@ -676,10 -677,13 +677,17 @@@ f
  %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
  
  %changelog
+ * Sat May 11 2013 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.40-1
+ - Updated to 7.0.40
+ - Resolves: rhbz 956569 added missing commons-pool link
+ 
+ * Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.39-1
+ - Updated to 7.0.39
+ 
 +* Mon Mar  4 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:7.0.37-2
 +- Add depmaps for org.eclipse.jetty.orbit
 +- Resolves: rhbz#917626
 +
  * Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.37-1
  - Updated to 7.0.37