From: Xinchen Hui <laruence@php.net>
Date: Sat, 21 Mar 2015 06:01:11 +0000 (+0800)
Subject: Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~570
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c524dd6d1efd31124803bb316c04970c35ad5b7b;p=php

Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src

Conflicts:
	Zend/zend_vm_gen.php
	ext/pcre/php_pcre.c
---

c524dd6d1efd31124803bb316c04970c35ad5b7b