]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Thu, 13 Jun 2013 17:31:31 +0000 (10:31 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 13 Jun 2013 17:31:31 +0000 (10:31 -0700)
* PHP-5.5:
  fix test for bug #60322


Trivial merge