master updated (2ce0d397b12 -> 8081c08ff1b)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  2ce0d397b12 Improve diagnostic of type mismatch in 'setopt'
       new  bb239841670 Support for custom php.ini for the built-in PHP web 
server.
       new  8081c08ff1b ; Update NEWS for last change.


Summary of changes:
 etc/NEWS                      | 10 ++++++
 lisp/progmodes/php-ts-mode.el | 75 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 69 insertions(+), 16 deletions(-)