[glib: 2/2] Merge branch 'master' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 7e63bc8eb168773bd93dc51b8d3d8ad395f182ed
Merge: 737a853f8 c2052a4ad
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 9 15:11:57 2020 +0000

    Merge branch 'master' into 'master'
    
    array: Avoid sorting 0-sized arrays
    
    Closes #2264
    
    See merge request GNOME/glib!1789

 glib/garray.c           | 44 ++++++++++++++++++++++++--------------------
 glib/tests/array-test.c | 16 ++++++++++++++++
 2 files changed, 40 insertions(+), 20 deletions(-)
---