[glib/glib-2-62: 2/2] Merge branch 'backport-1206-option-nul-termination' into 'glib-2-62'

[Simon McVittie <smcv src gnome org>]

commit 0a019869bb5522200cf5cbe5c5cf0330066a2ac8
Merge: b123ee4db 20863d352
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Oct 31 16:20:37 2019 +0000

    Merge branch 'backport-1206-option-nul-termination' into 'glib-2-62'
    
    Backport !1206 “goption: Relax assertion to avoid being broken by kdeinit5” to glib-2-62
    
    See merge request GNOME/glib!1207

 glib/goption.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---