From: Xinchen Hui <laruence@php.net>
Date: Sat, 11 Aug 2012 08:00:30 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66a6d1b97b682a37e0d1f2654d7dcbe2eabbbcc7;p=php

Merge branch 'PHP-5.4'
---

66a6d1b97b682a37e0d1f2654d7dcbe2eabbbcc7