Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)
* PHP-5.4:
  fix test for bug #60322


Trivial merge