[jenkins-executable-war] 04/05: Merge tag 'upstream/1.29'

[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-executable-war.

commit a9ae45999ff9456282a6a3182762150c426d8a4c
Merge: bcf83c0 21411c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 4 23:51:03 2014 +0200

    Merge tag 'upstream/1.29'
    
    Upstream version 1.29

 pom.xml                 |  2 +-
 src/main/java/Main.java | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

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