From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Mar 2013 13:11:42 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~111^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bf7549772fcda5e1b8551d7ea8c8f90669f0194;p=php

Merge branch 'PHP-5.5'
---

0bf7549772fcda5e1b8551d7ea8c8f90669f0194