[jenkins-winstone] 01/04: Merge tag 'upstream/0.9.10-jenkins-47'

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository jenkins-winstone.

commit 67f9d5a6219f9a2b5bb265aa1183e6a910b23cd9
Merge: 0ee0221 5af6ca2
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 09:27:29 2013 +0100

    Merge tag 'upstream/0.9.10-jenkins-47'
    
    Upstream version 0.9.10-jenkins-47

 README.html                                      |    4 ++-
 contrib/README_jp.html                           |    4 ++-
 pom.xml                                          |    2 +-
 src/java/winstone/Launcher.java                  |    2 +-
 src/java/winstone/LocalStrings.properties        |    8 +++--
 src/java/winstone/WebAppConfiguration.java       |   11 +++++--
 src/java/winstone/WinstoneRequest.java           |    4 +++
 src/java/winstone/WinstoneResponse.java          |    2 +-
 src/java/winstone/ajp13/Ajp13IncomingPacket.java |   13 +++++++-
 src/java/winstone/cmdline/Option.java            |    3 ++
 src/java/winstone/tools/WinstoneControl.java     |   16 ++++++++-
 src/test/winstone/WinstoneResponseTest.java      |   38 ++++++++++++++++++++--
 12 files changed, 92 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-winstone.git