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

Merge branch 'master' into json_parser_method
---

34a9882ad357620ccec2bfadba72fce027acd3d6