From: Xinchen Hui <laruence@php.net>
Date: Thu, 29 Aug 2013 06:01:54 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4RC1~4^2~3^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0cb67402f2bcd3dc310cf938dfce799ccec7c7b;p=php

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

f0cb67402f2bcd3dc310cf938dfce799ccec7c7b