From: Xinchen Hui <laruence@php.net>
Date: Fri, 11 May 2012 12:27:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~209^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7934c0ffaa96e206312e1305c23e349f75e05cc;p=php

Merge branch 'PHP-5.4'
---

e7934c0ffaa96e206312e1305c23e349f75e05cc