From: andrey <andrey@php.net>
Date: Wed, 2 May 2012 14:15:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd9e4d1defeb0d111221c6b8670ec39603dc49ff;p=php

Merge branch 'PHP-5.4'
---

cd9e4d1defeb0d111221c6b8670ec39603dc49ff