[axis] 57/60: Merge branch 'upstream'

[Emmanuel Bourg]

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

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

commit 6b1cf2b52568f90a41668672fb03143ce8a65eb0
Merge: b81940d b8b5e54
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 18:00:03 2017 +0100

    Merge branch 'upstream'


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