From: Xinchen Hui <laruence@php.net>
Date: Thu, 15 Aug 2013 03:49:59 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb361ed27ebaf490cac6fb134380daf162a68750;p=php

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

cb361ed27ebaf490cac6fb134380daf162a68750