[gtk] (2 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:

  5536295... testsuite: Add a testsuite for the json parser
  26f1833... testsuite: Run json parser as a single test

Commits added to the branch:

  529b64b... testsuite: Add a testsuite for the json parser
  b660f8c... testsuite: Run json parser as a single test