From: Xinchen Hui <laruence@php.net>
Date: Fri, 29 Mar 2013 15:46:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ea4210f8d19ad22a262ade85b99c4b80a2c5d73;p=php

Merge branch 'PHP-5.5'
---

3ea4210f8d19ad22a262ade85b99c4b80a2c5d73