[glib/glib-2-64: 3/3] Merge branch 'backport-1644-winhttp-file-display-name-glib-2-64' into 'glib-2-64'

[Sebastian Dröge <sdroege src gnome org>]

commit 6f4680284c82774e25bb245609a06ef49f20fdca
Merge: 6711f7d2f 5993bd950
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu Oct 1 10:30:21 2020 +0000

    Merge branch 'backport-1644-winhttp-file-display-name-glib-2-64' into 'glib-2-64'
    
    Backport !1644 “gwinhttpfile: Set display-name attribute on file info” to glib-2-64
    
    See merge request GNOME/glib!1646

 gio/win32/gwinhttpfile.c | 24 ++++++++++++++++++++++++
 glib/gutf8.c             |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
---