From: Xinchen Hui <laruence@php.net>
Date: Wed, 18 Jul 2012 11:48:27 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ed4026518cd9c2f460b3070e43c0305234397e3;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  skip for ZTS
---

2ed4026518cd9c2f460b3070e43c0305234397e3