From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 28 Mar 2013 11:14:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7f1279903d5a439415202154ca494f0f5307500;p=php

Merge branch 'PHP-5.5'
---

c7f1279903d5a439415202154ca494f0f5307500