From: Stanislav Malyshev <stas@php.net>
Date: Wed, 29 Aug 2012 05:11:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~22^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bab81675536528662ca1f0bd465b605bf09b3d73;p=php

Merge branch 'PHP-5.4'
---

bab81675536528662ca1f0bd465b605bf09b3d73