From: Xinchen Hui <laruence@php.net>
Date: Sun, 16 Jun 2013 14:57:01 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0842d5c06e14f639c10c6690fca7d786fd974728;p=php

Merge branch 'PHP-5.5'
---

0842d5c06e14f639c10c6690fca7d786fd974728