From: Remi Collet <remi@php.net>
Date: Wed, 24 Apr 2013 14:11:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~23^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5897696a0288b9e3abc292559d3ae07793f7c670;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment
---

5897696a0288b9e3abc292559d3ae07793f7c670