]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:36:35 +0000 (00:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:36:35 +0000 (00:36 -0700)
commit68e630b72f52aaa994cde8082f912a2d91b1b9c6
tree9be29ac0af8b46a0e7fdf892f1c55e46dae75086
parent0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a
parente617679c0ba616551df62ad370a70d5cf610c270
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc