]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 1 Feb 2017 11:57:02 +0000 (12:57 +0100)
committerAnatol Belski <ab@php.net>
Wed, 1 Feb 2017 11:57:02 +0000 (12:57 +0100)
* PHP-7.0:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed


Trivial merge