From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 5 Apr 2013 06:28:27 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1471ec7dcf5c557c397ae04b725387b02f82989d;p=php

Merge branch 'PHP-5.5'
---

1471ec7dcf5c557c397ae04b725387b02f82989d