[glib/glib-2-60: 2/2] Merge branch 'backport-954-unicode-mani-glib-2-60' into 'glib-2-60'

[Emmanuele Bassi <ebassi src gnome org>]

commit 1431ff07174b3ac7a40d2ff86e94ae46689a6cd3
Merge: 74a6c1274 4fe42771e
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Tue Jul 9 10:41:31 2019 +0000

    Merge branch 'backport-954-unicode-mani-glib-2-60' into 'glib-2-60'
    
    Backport !954 “Fix the ISO 15924 code for Manichaean” to glib-2-60
    
    See merge request GNOME/glib!956

 glib/gunicode.h      | 2 +-
 glib/guniprop.c      | 2 +-
 glib/tests/unicode.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---