]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 23 Jan 2013 18:44:38 +0000 (10:44 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 23 Jan 2013 18:44:38 +0000 (10:44 -0800)
* PHP-5.4:
  fix tests


Trivial merge