]> granicus.if.org Git - php/commit
Merge branch 'PHp-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)
commit6b53b7cd84bfb127b774b3d2de2bf215efd6eac1
treebba6164d36ac596574feea9a1723650042a65757
parent4e2fb470929ab13101c945e76e2ac397a730ba5a
parenteee8b6c33fc968ef8c496db8fb54e8c9d9d5a8f9
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  fix test
  update NEWS