From: Anatoliy Belsky <ab@php.net>
Date: Tue, 22 May 2012 16:52:37 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=163099ae0e6f01a1aac67ca84c3ce3b1f2409ae8;p=php

Merge branch 'PHP-5.4'

* 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
---

163099ae0e6f01a1aac67ca84c3ce3b1f2409ae8