From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Apr 2013 06:49:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf0ee2d332b4df0a1d27b14c11d4dea67a73d901;p=php

Merge branch 'PHP-5.5'
---

cf0ee2d332b4df0a1d27b14c11d4dea67a73d901