From: Jakub Zelenka <bukka@php.net>
Date: Tue, 3 May 2016 18:55:55 +0000 (+0100)
Subject: Merge branch 'json_parser_method' into json_parser_method_embed
X-Git-Tag: php-7.1.0alpha1~129^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afb4062c2c66d3080c08693af47c670bb63c285e;p=php

Merge branch 'json_parser_method' into json_parser_method_embed
---

afb4062c2c66d3080c08693af47c670bb63c285e