summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-04-30 17:25:11 +0200
committerAnatoliy Belsky <ab@php.net>2012-04-30 17:25:11 +0200
commit47c8b6039a104d0f064e9ad962016dbd86cf8d8c (patch)
tree4a9153e41bd192e1eaf79aa631184a945d22a13a /ext/json/json.c
parentfc24e74260399bf4a6badeb61f0e0eed4463d1d2 (diff)
parentd26e006d7f01db6fab3942ebbf073beaabf57e2d (diff)
downloadphp-git-47c8b6039a104d0f064e9ad962016dbd86cf8d8c.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions