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

Merge branch 'PHP-5.6' into PHP-7.0

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

e6bb7eb3aa4b0be66130b8299a21e94eeeec2368