]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 05:13:32 +0000 (22:13 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 05:13:32 +0000 (22:13 -0700)
commit232ab8d795103086c79f80542dad297b7efadf1a
tree9cbbcaa69ac023612598f9b5e5fad3a60db94a6e
parent342240fd7fb6ac0a287eb6f912c4d61d6274d68c
parentc42d5cf5de53e8cfe641c4905aabb4cf85977d89
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #67072 with more BC provisions