From: Anatol Belski <ab@php.net>
Date: Wed, 30 Mar 2016 23:38:38 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~395^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44c219b0b47c0d0693db9e56078e644e7e2fc36e;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix borked mainstream patch
  5.5.35 now
---

44c219b0b47c0d0693db9e56078e644e7e2fc36e