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

Merge branch 'PHP-5.5' into PHP-5.6

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

5bd13c523125a552f712f87a0ae55bb236c8fb54