From: Jakub Zelenka <bukka@php.net>
Date: Sun, 15 May 2016 12:50:23 +0000 (+0100)
Subject: Merge branch 'json_parser_method'
X-Git-Tag: php-7.1.0alpha1~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d02e00192489ecdce1ac598c10c0c579d2f70e;p=php

Merge branch 'json_parser_method'
---

89d02e00192489ecdce1ac598c10c0c579d2f70e