]> granicus.if.org Git - php/commit
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)
commit3cc59b3fa0d2bbea6f5d19eb38668f7b9c30b449
tree3e031a43277d0eb819e08fba2296d8ef67358790
parenta989c0a1a9e1d5666897b0ddbb855d926b812c1c
parentd258b7a5e43b1ff66a38b1a699c06d1ca5512b7d
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