]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:36:43 +0000 (00:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:36:43 +0000 (00:36 -0700)
* PHP-5.5:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc


Trivial merge