[apache2] 02/03: Merge branch 'upstream' into tmp

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit 7950b608224471c0766deb4fffd6c2285b137069
Merge: f422546 442e762
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Jan 25 22:16:46 2017 +0100

    Merge branch 'upstream' into tmp

 modules/http2/Makefile.in | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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