From: Anatol Belski <ab@php.net>
Date: Fri, 3 Jul 2015 14:22:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.0alpha3~25^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9adfb053e6704f2a48a937895a94d0484e6027cc;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix backport mistake
---

9adfb053e6704f2a48a937895a94d0484e6027cc