[json-glib: 7/7] Merge branch 'glib-fallback' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f454cb427fb74096847713fa7ce7ff192c4bfff
Merge: 816aa8d 30f93b8
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed Jan 23 15:30:41 2019 +0000

    Merge branch 'glib-fallback' into 'master'
    
    Updates to Meson build system
    
    See merge request GNOME/json-glib!13

 doc/meson.build       |  2 +-
 json-glib/meson.build |  8 ++++----
 meson.build           | 18 +++++++++---------
 meson_options.txt     |  6 +++---
 subprojects/glib.wrap |  5 +++++
 5 files changed, 22 insertions(+), 17 deletions(-)
---