From: Xinchen Hui <laruence@php.net>
Date: Sun, 6 Jan 2013 02:23:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbb5d42b9b970b04a2e328c6b8e211419f43b0c2;p=php

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

cbb5d42b9b970b04a2e328c6b8e211419f43b0c2