From: Christoph M. Becker <cmb@php.net>
Date: Mon, 13 Jul 2015 13:56:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.1RC1~35^2~10^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=959b2c3514ea2ca94bb3ec5fb0ff0e421a28c2c0;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
---

959b2c3514ea2ca94bb3ec5fb0ff0e421a28c2c0