From: Xinchen Hui <laruence@php.net>
Date: Wed, 2 Jul 2014 09:58:11 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC3~1^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f48f31153364108543d9f82798ce1383176592f3;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

f48f31153364108543d9f82798ce1383176592f3