From: Xinchen Hui <laruence@php.net>
Date: Sun, 31 Mar 2013 12:08:40 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4e16fe7ef68bb22201a217dd92e4e2c1ef309fe;p=php

Merge branch 'PHP-5.5'
---

f4e16fe7ef68bb22201a217dd92e4e2c1ef309fe