]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Tue, 26 Jan 2016 07:58:14 +0000 (15:58 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 26 Jan 2016 07:58:14 +0000 (15:58 +0800)
* 'master' of git.php.net:/php-src:
  add note on readline support
  check for NULL and avoid crashes


Trivial merge