From: Xinchen Hui <laruence@php.net>
Date: Tue, 20 May 2014 07:50:41 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~317^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2028491aa44367dbf77cc1008e9e4b027f60666;p=php

Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng

Conflicts:
	ext/pdo_pgsql/tests/common.phpt
---

f2028491aa44367dbf77cc1008e9e4b027f60666