Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2013-09-20 b334a01791689a16c8d6b10955df850b891ff40e

 program/include/rcmail_output_json.php

@@ -227,6 +227,13 @@
        if (!empty($this->callbacks))
            $response['callbacks'] = $this->callbacks;

        // trigger generic hook where plugins can put additional content to the response
        $hook = $this->app->plugins->exec_hook("render_response", array('response' => $response));

        // save some memory
        $response = $hook['response'];
        unset($hook['response']);

        echo self::json_serialize($response);
    }