]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Tue, 21 Jul 2015 00:00:16 +0000 (02:00 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 21 Jul 2015 00:00:16 +0000 (02:00 +0200)
commit22767a48a7bd060f3397713dfe5f2a5581496097
treec02bc30e81082d658f6322f9c75a4b72e274b435
parent0c651cf8c38d4adb5fee455c20380e341c0367d0
parentf18ba0f9c96bc344f010304ea07299cbdfb851ef
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures