From: Xinchen Hui <laruence@php.net>
Date: Wed, 3 Apr 2013 10:51:44 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e15a97f924904b499b8192347b206c39bdbdadcc;p=php

Merge branch 'PHP-5.5'
---

e15a97f924904b499b8192347b206c39bdbdadcc