From: Andrey Hristov <andrey@php.net>
Date: Wed, 9 Jan 2013 18:15:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=846e506a3d1d11773171e08d3c6f9bbc7fc3dacd;p=php

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

846e506a3d1d11773171e08d3c6f9bbc7fc3dacd