From: Xinchen Hui <laruence@php.net>
Date: Wed, 21 Nov 2012 04:31:16 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~706
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=458b71e3ee81d264ba8a59114a0cb59420ecf7d9;p=php

Merge branch 'PHP-5.5'
---

458b71e3ee81d264ba8a59114a0cb59420ecf7d9