From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 7 May 2015 14:27:29 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cc59b3fa0d2bbea6f5d19eb38668f7b9c30b449;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Add some NEWS entries
  Allow self etc in eval / file scope
  fix typo in php.ini
---

3cc59b3fa0d2bbea6f5d19eb38668f7b9c30b449