[json-glib: 11/11] Merge remote-tracking branch 'origin/master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 94b2e2de7f54c1237e928c0f1ec4655553492b61
Merge: 0c01de6 a8bd5f9
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Jul 10 16:20:48 2017 +0100

    Merge remote-tracking branch 'origin/master'

 README.md                   |    2 +-
 doc/meson.build             |    5 ++-
 doc/xml/meson.build         |    6 +-
 json-glib/json-gobject.c    |    2 +
 json-glib/meson.build       |   44 +++++++-----------
 json-glib/tests/meson.build |    4 +-
 meson.build                 |  107 +++++++++++++++++++++++--------------------
 po/meson.build              |    2 +-
 8 files changed, 87 insertions(+), 85 deletions(-)
---