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

[Philip Withnall <pwithnall src gnome org>]

commit f928dfdf57bf92c883b53b16d7a9d49add504f52
Merge: cf7193ee3 8519368c0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Sep 17 10:32:32 2018 +0000

    Merge branch 'master' into 'master'
    
    Issue #1513: fix g_icon_to_string() regression (doc inconsistency).
    
    Closes #1513
    
    See merge request GNOME/glib!305

 gio/gicon.c        | 20 ++++++++++++++------
 gio/tests/g-icon.c | 12 +++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)
---