]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 085e6a9 29876c5)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 22 May 2012 16:52:37 +0000 (18:52 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 22 May 2012 16:52:37 +0000 (18:52 +0200)
* PHP-5.4:
  Fix bug #62109 tests\basic\bug46313-win.phpt fails
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  add news for new pg_ functions

Conflicts:
UPGRADING


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