From: Anatol Belski <ab@php.net>
Date: Tue, 8 Jul 2014 07:54:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e715038920301172fe3b0621375a9e3b5de0cf62;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the patch from bug #67407 into 5.4
---

e715038920301172fe3b0621375a9e3b5de0cf62