Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Sun, 15 Nov 2015 19:13:49 +0000 (19:13 +0000)
committerJakub Zelenka <bukka@php.net>
Sun, 15 Nov 2015 19:13:49 +0000 (19:13 +0000)
commit3c320199896c63b2471cd832c7585744ef13f2eb
tree51def35d1355ec4f90a31d2d91c93d1d2117fb51
parent7819fef345f2ec80c4fea804b350e229af589990
parente5abc53701ba5a9b58dfaba3b59881c9c410a8e7
Merge branch 'PHP-5.6' into PHP-7.0
ext/json/tests/bug54484.phpt
ext/json/tests/pass003.phpt