]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 12:41:14 +0000 (14:41 +0200)
committerAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 12:41:14 +0000 (14:41 +0200)
* PHP-7.1:
  add missing header for gd_error
  fix syslog interference


Trivial merge