]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 7 May 2015 14:27:29 +0000 (17:27 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 7 May 2015 14:27:29 +0000 (17:27 +0300)
* 'master' of git.php.net:php-src:
  Add some NEWS entries
  Allow self etc in eval / file scope
  fix typo in php.ini


Trivial merge