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

Merge branch 'PHP-5.5'
---

79f68e285d1100fb6244d0fcdf09ff816aefdf85