From: Xinchen Hui <laruence@php.net>
Date: Thu, 25 Jul 2013 14:46:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~376^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c49de17fe54d2d34055e9e897203841944cc1821;p=php

Merge branch 'PHP-5.5'
---

c49de17fe54d2d34055e9e897203841944cc1821