From: Xinchen Hui <laruence@php.net>
Date: Sun, 3 Mar 2013 03:25:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~12^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46e612ada4679d6d87fca7581dcd303bf6d9dc42;p=php

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

46e612ada4679d6d87fca7581dcd303bf6d9dc42