[taglibs-standard] 05/12: 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 taglibs-standard.

commit 19a1369c646923deda345c8873c46d60ab99ae99
Merge: 2ae8e23 c6f155d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 20 17:07:04 2016 +0200

    Merge branch 'upstream'


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