From: Anatol Belski <ab@php.net>
Date: Thu, 13 Oct 2016 12:41:14 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de0024ad2d394c54a0be01089bd48136b11a3e50;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  add missing header for gd_error
  fix syslog interference
---

de0024ad2d394c54a0be01089bd48136b11a3e50