]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
sync merge with trunk
authorJacob Champion <jchampion@apache.org>
Fri, 6 Jan 2017 19:55:46 +0000 (19:55 +0000)
committerJacob Champion <jchampion@apache.org>
Fri, 6 Jan 2017 19:55:46 +0000 (19:55 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777707 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge