From: Remi Collet <remi@php.net>
Date: Wed, 12 Mar 2014 12:46:51 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8c1205d84b37608901b9e588ceff566d1fa63eb;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault
---

c8c1205d84b37608901b9e588ceff566d1fa63eb