]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 20:56:31 +0000 (13:56 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 28 Jun 2013 20:56:31 +0000 (13:56 -0700)
* PHP-5.5:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing


Trivial merge