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

[Emmanuel Bourg]

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

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

commit 1f8076a95f0dbae4d3514654578c58dac6d07769
Merge: 8c97658 b47af06
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Dec 12 11:09:23 2015 +0100

    Merge tag 'upstream/2.9'
    
    Upstream version 2.9

 pom.xml                               | 4 ++--
 src/java/winstone/Launcher.java       | 2 ++
 src/java/winstone/cmdline/Option.java | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

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