Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 12:51:16 +0000 (14:51 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 12:51:16 +0000 (14:51 +0200)
commitfa7f215d19b3546c028b2cfb9864d28a06ac29af
tree506cf6eaf70f3df3e4d7311d32064dc5d907ae55
parent105a9a9d455a29951add13f5add9e0b59520f79e
parenta9121819d012faa2a2c57e05eddc7a511ca520f7
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Fixed problem introduced in a763929 (fixing bug #61347).