[gegl: 19/19] Merge remote-tracking branch 'origin/meta-json'

[Jon Nordby <jonnor src gnome org>]

commit 564f45bad76eb0f888e628ea70345912dd68cbbb
Merge: 539c231 aed6865
Author: Jon Nordby <jononor gmail com>
Date:   Tue Jan 20 17:20:08 2015 +0100

    Merge remote-tracking branch 'origin/meta-json'

 configure.ac                               |    2 +-
 gegl/operation/Makefile.am                 |    2 +
 gegl/operation/gegl-operation-meta-json.c  |   54 +++
 gegl/operation/gegl-operation-meta-json.h  |   56 +++
 operations/core/Makefile.am                |    1 +
 operations/core/json.c                     |  592 ++++++++++++++++++++++++++++
 operations/json/dropshadow2.fbp            |   22 +
 operations/json/dropshadow2.json           |  152 +++++++
 operations/json/grey2.fbp                  |    6 +
 operations/json/grey2.json                 |   71 ++++
 tests/compositions/Makefile.am             |    1 +
 tests/compositions/dropshadow-json.xml     |   13 +
 tests/compositions/grey-json.xml           |   14 +
 tests/compositions/reference/grey-json.png |  Bin 0 -> 44747 bytes
 14 files changed, 985 insertions(+), 1 deletions(-)
---