]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 129c830 df2a38e)
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)
* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
UPGRADING


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.