From: Xinchen Hui <laruence@php.net>
Date: Thu, 18 Oct 2012 12:12:00 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84efca62ff505601fe9037f34dbdcf96c6ee8fd9;p=php

Merge branch 'PHP-5.4'
---

84efca62ff505601fe9037f34dbdcf96c6ee8fd9