]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Sun, 25 Nov 2012 07:21:10 +0000 (08:21 +0100)
committerRemi Collet <remi@php.net>
Sun, 25 Nov 2012 07:21:10 +0000 (08:21 +0100)
commitf4a8612561b5b446d563901a3f13edf9e6298267
tree98804a9ba33e795a12c7d821a5eba719a1ab3a6a
parentc5d4ee9bed992e1ac7f74be8ddfc0ae0c510df1e
parent289bb339c9e722ff3017ec58fdef7300f39b8e6d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63588 Duplicate implementation of php_next_utf8_char
ext/json/json.c