From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 10 Apr 2013 18:13:46 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87f5d9aa1bb9bdbfaecce5ad4739788a7719358f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

87f5d9aa1bb9bdbfaecce5ad4739788a7719358f