From: Xinchen Hui <laruence@php.net>
Date: Tue, 5 Nov 2013 03:09:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a94494b7e87a93f34dad608139aceb970860166;p=php

Merge branch 'PHP-5.5'
---

2a94494b7e87a93f34dad608139aceb970860166