From: Xinchen Hui <laruence@php.net>
Date: Mon, 11 Mar 2013 07:19:59 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01e1ba88736e42de342bbcf14802d36b7811a243;p=php

Merge branch 'PHP-5.5'

Conflicts:
	UPGRADING
---

01e1ba88736e42de342bbcf14802d36b7811a243