]> granicus.if.org Git - php/commit
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)
commit7df2190f1364cb6a06b5a0f655a0611858e29ea0
tree071f22c43abe5fff3012047f82f71fd44d4b3451
parentc58ad955a9b48729268142c360c06387c2ea28d8
parent9a33f6583b01c24f353c693f66a2560aa3490217
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  add note on readline support
  check for NULL and avoid crashes