From: Xinchen Hui <laruence@php.net>
Date: Mon, 17 Dec 2012 06:30:20 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea649a5aba776f3058ce006e450844ec8773ab7f;p=php

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

ea649a5aba776f3058ce006e450844ec8773ab7f