From: Anatol Belski <ab@php.net>
Date: Mon, 24 Mar 2014 18:18:39 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0beta1~3^2~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=223f7d9a44332fc08574a18af0266da45c42f340;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more fixes related to bug #65715
---

223f7d9a44332fc08574a18af0266da45c42f340