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

Merge branch 'PHP-5.5'
---

0acdeec743bba32be9e4c95018d34ebd79bbb315