]> granicus.if.org Git - apache/commitdiff
Sync-merge with trunk
authorJacob Champion <jchampion@apache.org>
Mon, 9 Jan 2017 19:10:05 +0000 (19:10 +0000)
committerJacob Champion <jchampion@apache.org>
Mon, 9 Jan 2017 19:10:05 +0000 (19:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778029 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge