]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Fri, 13 Jun 2014 11:14:52 +0000 (13:14 +0200)
committerMatteo Beccati <mbeccati@php.net>
Fri, 13 Jun 2014 11:14:52 +0000 (13:14 +0200)
* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable

1  2 
ext/standard/array.c

Simple merge