From: Andrey Hristov <andrey@php.net>
Date: Tue, 28 Jan 2014 13:23:54 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.26RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eafe070f86eb53271e7c95572f371d9abcadf252;p=php

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
---

eafe070f86eb53271e7c95572f371d9abcadf252