From: Yann Ylavic <ylavic@apache.org>
Date: Sun, 17 Jan 2021 21:00:19 +0000 (+0000)
Subject: Add mergeinfos after backports.
X-Git-Tag: 2.4.47~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36be41bf6e2a57cce0cfd1be1e5d31a3ea20334b;p=thirdparty%2Fapache%2Fhttpd.git

Add mergeinfos after backports.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1885623 13f79535-47bb-0310-9956-ffa450edef68
---