[plexus-sec-dispatcher] 20/22: 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 plexus-sec-dispatcher.

commit ba68610365851534c49382aaae649fa64aa6e3f4
Merge: 10157e1 70ff61a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 17:00:46 2017 +0200

    Merge branch 'upstream'


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