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

[Xavier Claessens <xclaesse src gnome org>]

commit f54b48b3e6b3017a55815e7562fd33f4d93ad2e8
Merge: 23f286e04 8cc92bcca
Author: Xavier Claessens <xclaesse gmail com>
Date:   Tue Nov 20 19:14:52 2018 +0000

    Merge branch 'master' into 'master'
    
    meson: Turn selinux into a meson feature and make it auto by default
    
    See merge request GNOME/glib!483

 meson.build       | 7 ++++---
 meson_options.txt | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---