From: Anatol Belski <ab@php.net>
Date: Sat, 20 Sep 2014 17:46:44 +0000 (+0200)
Subject: Merge branch 'pull-request/805'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~82^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=132cd8be0d13eaeee200cfa09b0596f6619c6a7e;p=php

Merge branch 'pull-request/805'

* pull-request/805:
  Removes accidentally added files.
  Reverts some unwanted changes
  Deletes patch leftovers
  Replaces php5 with php7, without whitespace changes.
---

132cd8be0d13eaeee200cfa09b0596f6619c6a7e