[glib: 2/2] Merge branch 'revert-08f41d80' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 449dcca106d1f22ee279e4c4054e1907ebd2402c
Merge: aa6721f1e d3881bb1b
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed Jul 11 22:05:47 2018 +0000

    Merge branch 'revert-08f41d80' into 'master'
    
    Revert "Merge branch 'type-safe-g-clear-pointer-1425' into 'master'"
    
    See merge request GNOME/glib!176

 glib/gmem.h               | 11 -----------
 gobject/gobject.c         |  2 +-
 gobject/gobject.h         |  2 +-
 gobject/tests/reference.c |  2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)
---