]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 19:56:37 +0000 (12:56 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 19:56:37 +0000 (12:56 -0700)
commit34418222d784f0b3666649fb9afb05ffcf5cedb7
treec0b78e9f6e3940c71f12cc2d220aef9d1169489a
parente55e40ca666dc1648290680b2c9bf69e7db4c1b3
parent9ba4db5e5d6aae8b1df934fbe26ea976b026576d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests