]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorReeze Xia <reeze@php.net>
Tue, 3 Mar 2015 10:38:28 +0000 (18:38 +0800)
committerReeze Xia <reeze@php.net>
Tue, 3 Mar 2015 10:38:28 +0000 (18:38 +0800)
* 'master' of git.php.net:php-src:
  Remove wrong commit committed by accident
  Fixed bug #69167 (call_user_func does not support references anymore)
  Fixed #69166 (Assigning array_values() to array does not reset key counter)


Trivial merge