From: Xinchen Hui <laruence@php.net>
Date: Sat, 27 Apr 2013 15:50:23 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC1~32^2~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e60638faca6234f436649cbca11ab7237922dd43;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

e60638faca6234f436649cbca11ab7237922dd43