[glib: 2/2] Merge branch 'wip/mjog/accept-certificate-docs' into 'master'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8109eaae5d6aac972dbdba78a1be7c455591b068
Merge: 0d3fe5c35 d7aedeff2
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Tue Jan 8 18:29:20 2019 +0000

    Merge branch 'wip/mjog/accept-certificate-docs' into 'master'
    
    gio: Update bad cert error in accept-certificate and GTlsError docs
    
    See merge request GNOME/glib!575

 gio/gdtlsconnection.c | 4 ++--
 gio/gioenums.h        | 3 ++-
 gio/gtlsconnection.c  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
---