]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Sat, 23 Jun 2012 19:15:59 +0000 (21:15 +0200)
committerNikita Popov <nikic@php.net>
Sat, 23 Jun 2012 19:15:59 +0000 (21:15 +0200)
commitd68b614b09b984e915db50b72430db4e4731480c
tree2826c121a85bb3556dffdf971709574efd80d3a2
parent1fc5659ebd6f2898ab474087f7877bcc4e774403
parent36fa17a5fae84ab332366a202f0a709279a2466a
Merge branch 'PHP-5.4'

* PHP-5.4:
  Improve json_encode error handling
  - BFN
  - BFN