]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristoph M. Becker <cmb@php.net>
Fri, 14 Aug 2015 15:21:09 +0000 (17:21 +0200)
committerChristoph M. Becker <cmb@php.net>
Fri, 14 Aug 2015 15:21:09 +0000 (17:21 +0200)
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Executed file can be NULL


Trivial merge