From: Xinchen Hui <laruence@php.net>
Date: Sun, 16 Jun 2013 14:56:22 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cd6349ff8842a9356723b7b192eb3c93fb64c7e;p=php

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

6cd6349ff8842a9356723b7b192eb3c93fb64c7e