From: Xinchen Hui <laruence@php.net>
Date: Mon, 1 Apr 2013 11:16:44 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa1c764e3ec9931f5159a5dc66426b69613cef68;p=php

Merge branch 'PHP-5.5'
---

aa1c764e3ec9931f5159a5dc66426b69613cef68