From: Xinchen Hui <laruence@php.net>
Date: Tue, 25 Jun 2013 05:40:19 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8374c5590370056cf2001e5a2f879ab9a3e77b0;p=php

Merge branch 'PHP-5.5'
---

d8374c5590370056cf2001e5a2f879ab9a3e77b0