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

Merge branch 'PHP-5.5'
---

d28b5e8ff2c2c799678167f440391c87394f6f1e