From: Xinchen Hui <laruence@php.net>
Date: Fri, 2 Aug 2013 10:39:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78673d1badd39362dff15d4124d7df0cbcec862f;p=php

Merge branch 'PHP-5.5'
---

78673d1badd39362dff15d4124d7df0cbcec862f