From: Xinchen Hui <laruence@php.net>
Date: Thu, 27 Jun 2013 04:38:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~384^2~17^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a441d9274b0045de20402b3912d04ca3de57365d;p=php

Merge branch 'PHP-5.5'
---

a441d9274b0045de20402b3912d04ca3de57365d