From: Xinchen Hui <laruence@php.net>
Date: Sun, 26 Aug 2012 10:28:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~22^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14c88ff82c1832c2e0d2c4ee49c0170cad3158d5;p=php

Merge branch 'PHP-5.4'
---

14c88ff82c1832c2e0d2c4ee49c0170cad3158d5