From: Xinchen Hui <laruence@php.net>
Date: Mon, 4 Nov 2013 06:43:30 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~214^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15eabbb43602ea7020ef7b6d99260e338fcc3aee;p=php

Merge branch 'PHP-5.5'
---

15eabbb43602ea7020ef7b6d99260e338fcc3aee