[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.42-1-3-g031ca79

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 031ca79ea184be53b7f295ce868520aba0826f42
Merge: 8d327c26e0308256c6499bb300e38d62c7b6f667 52accd7b0d66ab7b95b1c52a251831bec8621b91
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Aug 1 12:06:46 2013 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/tomcat7

diff --combined debian/changelog
index 78ad16d,66a341b..8fe4bda
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,7 +1,17 @@@
 +tomcat7 (7.0.42-2) UNRELEASED; urgency=low
 +
 +  * Removed -Djava.net.preferIPv4Stack=true
 +    from init script (lp: #1088681),
 +    thanks Hendrik Haddorp.
 +  * Added webapp manager path patch (lp: #1128067)
 +    thanks TJ.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 01 Aug 2013 11:53:03 +0200
 +
  tomcat7 (7.0.42-1) unstable; urgency=low
  
+   [ Gianfranco Costamagna ]
+   * Team upload.
    * New upstream release.
    * Added libhamcrest-java >= 1.3 as build-dep,
      tweaked debian/rules.
@@@ -111,7 -103,7 +113,7 @@@ tomcat7 (7.0.28-4) unstable; urgency=hi
  
    * Acknowledge NMU: 7.0.28-3+nmu1 (Closes: #692440)
      - Thank you to Michael Gilbert.
-   0* Add patches for the following security issues: (Closes: #695251)
+   * Add patches for the following security issues: (Closes: #695251)
      - CVE-2012-4431, CVE-2012-3546
  
   -- tony mancill <tmancill at debian.org>  Thu, 06 Dec 2012 22:25:07 -0800

-- 
tomcat7: Servlet and JSP engine