From: Xinchen Hui <laruence@php.net>
Date: Mon, 25 Mar 2013 15:49:23 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~86^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c356038c6eb1d970e716067aaf259c21131f963e;p=php

Merge branch 'PHP-5.5'
---

c356038c6eb1d970e716067aaf259c21131f963e