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

[Simon McVittie <smcv src gnome org>]

commit 3f1a79a4fa628924732e82b42bb85916166cce2f
Merge: c50304fdc 6a1512ed6
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Jul 23 13:01:09 2019 +0000

    Merge branch 'allow_guid_key_in_dbus_addresses' into 'master'
    
    Allow guid key in dbus addresses
    
    Closes #1018
    
    See merge request GNOME/glib!995

 gio/gdbusaddress.c          | 6 +++---
 gio/tests/gdbus-addresses.c | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
---