From: Xinchen Hui <laruence@php.net>
Date: Sun, 9 Jun 2013 06:25:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~29^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b839e6921da08adf1d8413cea5c2a21da069e23e;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_def.h
---

b839e6921da08adf1d8413cea5c2a21da069e23e