From: Remi Collet <remi@php.net>
Date: Wed, 12 Mar 2014 14:36:52 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a498e649142b9ae773eb695fe5cd0d5bb379893c;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
---

a498e649142b9ae773eb695fe5cd0d5bb379893c