]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Thu, 28 Jun 2012 18:18:19 +0000 (20:18 +0200)
committerNikita Popov <nikic@php.net>
Thu, 28 Jun 2012 18:18:19 +0000 (20:18 +0200)
commit405ebfcd182a39f0960ff7d7055d49053d3e0316
treebb05d983ab5a9301ae97838d8d6c8c002e8200e7
parent2996eeeed094f66d57d79552d642129d60937c6d
parent974324676b2436f159f42d9241c569f813471684
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add json_last_error_msg() function
ext/json/json.c