]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0aadbf7 e617679)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.