From: Andrey Hristov <andrey@php.net>
Date: Tue, 26 Nov 2013 17:15:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.7RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a6b72a05ad6be151e5952e9a5fa6e645fb17a5f;p=php

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

9a6b72a05ad6be151e5952e9a5fa6e645fb17a5f