]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Wed, 16 May 2012 05:39:17 +0000 (22:39 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 16 May 2012 05:39:17 +0000 (22:39 -0700)
commit6a0212ea8859588988454abe2b23ee7b6e536da6
treec856c1e67619d6afe4fb9a7ef1f77cbb8cb5c5bb
parent129c83056263da0adb11734ad1bea57e3abe62f5
parentdf2a38e7f8603f51afa4c2257b3369067817d818
Merge branch 'PHP-5.4'

* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
UPGRADING