From: Xinchen Hui <laruence@php.net>
Date: Fri, 8 Mar 2013 02:36:13 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79a96d2af0fa351cd9c229d23872fdfcc81031a1;p=php

Merge branch 'PHP-5.5'

Conflicts:
	NEWS-5.5
---

79a96d2af0fa351cd9c229d23872fdfcc81031a1