]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 19 Mar 2013 11:47:43 +0000 (15:47 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 19 Mar 2013 11:47:43 +0000 (15:47 +0400)
commit960d5be52873acdf1afc67aa12b72d2cdc93119c
tree2681627ee42e08c9e4aca21039b7c892d5dc415f
parent74e11fb14c983302c84ee88fee40248b6f9b0f9a
parent984561cfa81adfd893833bce506544349b04c803
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #64239
Zend/zend_builtin_functions.c