From: Stanislav Malyshev <stas@php.net>
Date: Mon, 15 Jul 2013 07:36:35 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68e630b72f52aaa994cde8082f912a2d91b1b9c6;p=php

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
---

68e630b72f52aaa994cde8082f912a2d91b1b9c6