From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 9 Oct 2016 13:20:37 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC4~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a16f0c5e011e84d6c8fdb7f0e283a8ae185ab5d3;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

a16f0c5e011e84d6c8fdb7f0e283a8ae185ab5d3
diff --cc NEWS
index c54861b6ff,acf58500a9..22fa5086e8
--- a/NEWS
+++ b/NEWS
@@@ -20,7 -11,12 +20,9 @@@ PH
  
  - GD:
    . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb)
-   
+   . Fixed bug #73272 (imagescale() is not affected by, but affects
+     imagesetinterpolation()). (cmb)
+ 
 -- phpdbg:
 -  . Properly allow for stdin input from a file. (Bob)
 -
  - Standard:
    . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)