From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 10 Apr 2013 18:14:00 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca1962949eb18f60624e3cae5343a5b3dff98383;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
---

ca1962949eb18f60624e3cae5343a5b3dff98383