[gtk] (4 commits) Non-fast-forward update to branch wip/otte/json

[Benjamin Otte <otte src gnome org>]

The branch 'wip/otte/json' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  b9a5f7b... Add GtkJsonParser
  f3aeef3... Add GtkJsonPrinter
  1fb5d84... tools: Add gtk-json-format
  2160d8d... testsuite: Add a test for the json parser

Commits added to the branch:

  188ce37... Add GtkJsonParser
  ca0ccde... Add GtkJsonPrinter
  f423fe7... tools: Add gtk-json-format
  05588cc... testsuite: Add a test for the json parser